Merge branch 'EMC-19-gemet-fix' into 'develop'

Remove GEMET themes from gemetVocabulary Closes EMC-19 See merge request eip/catalogue!543
NERC-CEH · Oct 10, 2023 · f007f5c · f007f5c
2 parents 836cf63 + 241ceb8
commit f007f5c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/config/KeywordVocabulariesConfig.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/config/KeywordVocabulariesConfig.java
@@ -167,25 +167,23 @@ public KeywordVocabulary elterCLVocabulary(
     @Bean
     public KeywordVocabulary gemetVocabulary(
         SolrClient solrClient,
-        @Value("${gemet.concepturl}") String gemetConceptUrl,
-        @Value("${gemet.themeurl}") String gemetThemeUrl
+        @Value("${gemet.concepturl}") String gemetConceptUrl
     ) {
         /* GEMET is the GEneral Multilingual Environmental Thesaurus
          *
          * This vocabulary was implemented using the documentation located at
          * https://www.eionet.europa.eu/gemet/en/webservices/
          *
-         * Its purpose is to harvest the GEMET Themes and Concepts only,
-         * so NOT groups and supergroups.
+         * Its purpose is to harvest the GEMET concepts only - so NOT themes,
+         * groups and supergroups.
          *
          * See EMC-6 in Jira for details.
          */
         val catalogueIds = List.of("eidc");
-        val gemetUrls = List.of(gemetConceptUrl, gemetThemeUrl);
         return new HttpKeywordVocabulary(
             "gemet",
             "GEMET",
-            gemetUrls,
+            gemetConceptUrl,
             "",
             "/uri",
             "/preferredLabel/string",

diff --git a/java/src/main/resources/application.properties b/java/src/main/resources/application.properties
@@ -18,7 +18,6 @@ doi.publisher=NERC EDS Environmental Information Data Centre
 doi.legacyPublisher=NERC Environmental Information Data Centre
 doi.templateLocation=/datacite/datacite.ftlx
 doi.username=BL.NERC
-gemet.themeurl=https://www.eionet.europa.eu/gemet/getTopmostConcepts?thesaurus_uri=http://www.eionet.europa.eu/gemet/theme/&language=en
 gemet.concepturl=https://www.eionet.europa.eu/gemet/getConceptsMatchingRegexByThesaurus?regex=^&thesaurus_uri=http://www.eionet.europa.eu/gemet/concept/&language=en
 hubbub.location=/var/ceh-catalogue/dropbox
 hubbub.url=https://hubbub.ceh.ac.uk/v7