From 7b45f6ece3fdae680e5d353bc3b976d311afb90e Mon Sep 17 00:00:00 2001
From: Josh Lagrimas <joshlagrimas@ebi.ac.uk>
Date: Wed, 29 Mar 2023 20:36:01 +0100
Subject: [PATCH 1/2] rename backup bin folder

---
 zooma-builder-app/src/main/{bin-rh74 => bin-rh}/build-labels.lsf  | 0
 .../src/main/{bin-rh74 => bin-rh}/build-lucene-index.lsf          | 0
 .../src/main/{bin-rh74 => bin-rh}/build-lucene-submit.lsf         | 0
 .../src/main/{bin-rh74 => bin-rh}/build-rdf-submit.lsf            | 0
 zooma-builder-app/src/main/{bin-rh74 => bin-rh}/build-rdf.lsf     | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename zooma-builder-app/src/main/{bin-rh74 => bin-rh}/build-labels.lsf (100%)
 rename zooma-builder-app/src/main/{bin-rh74 => bin-rh}/build-lucene-index.lsf (100%)
 rename zooma-builder-app/src/main/{bin-rh74 => bin-rh}/build-lucene-submit.lsf (100%)
 rename zooma-builder-app/src/main/{bin-rh74 => bin-rh}/build-rdf-submit.lsf (100%)
 rename zooma-builder-app/src/main/{bin-rh74 => bin-rh}/build-rdf.lsf (100%)

diff --git a/zooma-builder-app/src/main/bin-rh74/build-labels.lsf b/zooma-builder-app/src/main/bin-rh/build-labels.lsf
similarity index 100%
rename from zooma-builder-app/src/main/bin-rh74/build-labels.lsf
rename to zooma-builder-app/src/main/bin-rh/build-labels.lsf
diff --git a/zooma-builder-app/src/main/bin-rh74/build-lucene-index.lsf b/zooma-builder-app/src/main/bin-rh/build-lucene-index.lsf
similarity index 100%
rename from zooma-builder-app/src/main/bin-rh74/build-lucene-index.lsf
rename to zooma-builder-app/src/main/bin-rh/build-lucene-index.lsf
diff --git a/zooma-builder-app/src/main/bin-rh74/build-lucene-submit.lsf b/zooma-builder-app/src/main/bin-rh/build-lucene-submit.lsf
similarity index 100%
rename from zooma-builder-app/src/main/bin-rh74/build-lucene-submit.lsf
rename to zooma-builder-app/src/main/bin-rh/build-lucene-submit.lsf
diff --git a/zooma-builder-app/src/main/bin-rh74/build-rdf-submit.lsf b/zooma-builder-app/src/main/bin-rh/build-rdf-submit.lsf
similarity index 100%
rename from zooma-builder-app/src/main/bin-rh74/build-rdf-submit.lsf
rename to zooma-builder-app/src/main/bin-rh/build-rdf-submit.lsf
diff --git a/zooma-builder-app/src/main/bin-rh74/build-rdf.lsf b/zooma-builder-app/src/main/bin-rh/build-rdf.lsf
similarity index 100%
rename from zooma-builder-app/src/main/bin-rh74/build-rdf.lsf
rename to zooma-builder-app/src/main/bin-rh/build-rdf.lsf

From 062e68582d115e8a5a27404a7d2d214163ee73b8 Mon Sep 17 00:00:00 2001
From: henrietteharmse <henrietteharmse@gmail.com>
Date: Tue, 23 Jan 2024 15:31:44 +0000
Subject: [PATCH 2/2] Return ontologyId if preferredPrefix is null.

---
 .../ac/ebi/pride/utilities/ols/web/service/model/Config.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ols-client/src/main/java/uk/ac/ebi/pride/utilities/ols/web/service/model/Config.java b/ols-client/src/main/java/uk/ac/ebi/pride/utilities/ols/web/service/model/Config.java
index ada9e6fb..5df026c7 100644
--- a/ols-client/src/main/java/uk/ac/ebi/pride/utilities/ols/web/service/model/Config.java
+++ b/ols-client/src/main/java/uk/ac/ebi/pride/utilities/ols/web/service/model/Config.java
@@ -121,7 +121,10 @@ public void setNamespace(String namespace) {
     }
 
     public String getPreferredPrefix() {
-        return preferredPrefix;
+        if (preferredPrefix != null)
+            return preferredPrefix;
+        else
+            return getId();
     }
 
     public void setPreferredPrefix(String preferredPrefix) {