diff --git a/ardcvocabs/pom.xml b/ardcvocabs/pom.xml index 51df694a..01d40f92 100644 --- a/ardcvocabs/pom.xml +++ b/ardcvocabs/pom.xml @@ -60,11 +60,6 @@ org.springframework.retry spring-retry - - org.jsoup - jsoup - 1.18.1 - diff --git a/ardcvocabs/src/main/java/au/org/aodn/ardcvocabs/model/ArdcCurrentPaths.java b/ardcvocabs/src/main/java/au/org/aodn/ardcvocabs/model/ArdcCurrentPaths.java new file mode 100644 index 00000000..0327b435 --- /dev/null +++ b/ardcvocabs/src/main/java/au/org/aodn/ardcvocabs/model/ArdcCurrentPaths.java @@ -0,0 +1,29 @@ +package au.org.aodn.ardcvocabs.model; + +import lombok.Getter; + +@Getter +public enum ArdcCurrentPaths { + PARAMETER_VOCAB( + "/aodn-parameter-category-vocabulary/current/concept.json", + "/aodn-discovery-parameter-vocabulary/current/concept.json" + ), + PLATFORM_VOCAB( + "/aodn-platform-category-vocabulary/current/concept.json", + "/aodn-platform-vocabulary/current/concept.json" + ), + ORGANISATION_VOCAB( + "/aodn-organisation-category-vocabulary/current/concept.json", + "/aodn-organisation-vocabulary/current/concept.json" + ); + + + private final String categoryCurrent; + private final String vocabCurrent; + + ArdcCurrentPaths(String categoryRoot, String vocabRoot) { + String rootHostname = "https://vocabs.ardc.edu.au/repository/api/lda/aodn"; + this.categoryCurrent = rootHostname + categoryRoot; + this.vocabCurrent = rootHostname + vocabRoot; + } +} diff --git a/ardcvocabs/src/main/java/au/org/aodn/ardcvocabs/model/ArdcRootPaths.java b/ardcvocabs/src/main/java/au/org/aodn/ardcvocabs/model/ArdcRootPaths.java deleted file mode 100644 index f9812a08..00000000 --- a/ardcvocabs/src/main/java/au/org/aodn/ardcvocabs/model/ArdcRootPaths.java +++ /dev/null @@ -1,29 +0,0 @@ -package au.org.aodn.ardcvocabs.model; - -import lombok.Getter; - -@Getter -public enum ArdcRootPaths { - PARAMETER_VOCAB( - "/viewById/24", - "/viewById/22" - ), - PLATFORM_VOCAB( - "/viewById/26", - "/viewById/25" - ), - ORGANISATION_VOCAB( - "/viewById/29", - "/viewById/28" - ); - - - private final String categoryRoot; - private final String vocabRoot; - - ArdcRootPaths(String categoryRoot, String vocabRoot) { - String rootHostname = "https://vocabs.ardc.edu.au"; - this.categoryRoot = rootHostname + categoryRoot; - this.vocabRoot = rootHostname + vocabRoot; - } -} diff --git a/ardcvocabs/src/main/java/au/org/aodn/ardcvocabs/service/ArdcVocabServiceImpl.java b/ardcvocabs/src/main/java/au/org/aodn/ardcvocabs/service/ArdcVocabServiceImpl.java index 800c59d1..ee562f8a 100644 --- a/ardcvocabs/src/main/java/au/org/aodn/ardcvocabs/service/ArdcVocabServiceImpl.java +++ b/ardcvocabs/src/main/java/au/org/aodn/ardcvocabs/service/ArdcVocabServiceImpl.java @@ -1,17 +1,12 @@ package au.org.aodn.ardcvocabs.service; -import au.org.aodn.ardcvocabs.model.ArdcRootPaths; +import au.org.aodn.ardcvocabs.model.ArdcCurrentPaths; import au.org.aodn.ardcvocabs.model.PathName; import au.org.aodn.ardcvocabs.model.VocabApiPaths; import au.org.aodn.ardcvocabs.model.VocabModel; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; -import jakarta.annotation.PostConstruct; -import lombok.Getter; -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; -import org.jsoup.nodes.Element; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -37,44 +32,43 @@ public class ArdcVocabServiceImpl implements ArdcVocabService { protected RestTemplate restTemplate; protected RetryTemplate retryTemplate; - protected static final String VERSION_REGEX = "^version-\\d+-\\d+$"; + protected static final String VERSION_REGEX = "/(version-\\d+-\\d+)(?:/|$)"; public Map> getResolvedPathCollection() { Map> resolvedPathCollection = new HashMap<>(); - for (ArdcRootPaths rootPath : ArdcRootPaths.values()) { + for (ArdcCurrentPaths currentPath : ArdcCurrentPaths.values()) { try { - // Fetch HTML contents for category and vocab - String categoryRootHtmlContent = fetchHtmlContent(rootPath.getCategoryRoot()); - String vocabRootHtmlContent = fetchHtmlContent(rootPath.getVocabRoot()); + ObjectNode categoryCurrentContent = fetchCurrentContents(currentPath.getCategoryCurrent()); + ObjectNode vocabCurrentContent = fetchCurrentContents(currentPath.getVocabCurrent()); - if (categoryRootHtmlContent != null && vocabRootHtmlContent != null) { + if (categoryCurrentContent != null && vocabCurrentContent != null) { // Extract versions - String categoryVersion = extractVersionFromHtmlContent(categoryRootHtmlContent); - String vocabVersion = extractVersionFromHtmlContent(vocabRootHtmlContent); + String categoryVersion = extractVersionFromCurrentContent(categoryCurrentContent); + String vocabVersion = extractVersionFromCurrentContent(vocabCurrentContent); if (categoryVersion != null && vocabVersion != null) { - log.info("Fetched ARDC category version for {}: {}", rootPath.name(), categoryVersion); - log.info("Fetched ARDC vocab version for {}: {}", rootPath.name(), vocabVersion); + log.info("Fetched ARDC category version for {}: {}", currentPath.name(), categoryVersion); + log.info("Fetched ARDC vocab version for {}: {}", currentPath.name(), vocabVersion); // Build and store resolved paths - Map resolvedPaths = buildResolvedPaths(rootPath, categoryVersion, vocabVersion); - resolvedPathCollection.put(rootPath.name(), resolvedPaths); + Map resolvedPaths = buildResolvedPaths(currentPath, categoryVersion, vocabVersion); + resolvedPathCollection.put(currentPath.name(), resolvedPaths); } else { - log.error("Failed to extract versions for {}", rootPath.name()); + log.error("Failed to extract versions for {}", currentPath.name()); } } else { - log.error("Failed to fetch HTML content for {}", rootPath.name()); + log.error("Failed to fetch HTML content for {}", currentPath.name()); } } catch (Exception e) { - log.error("Error initialising versions for {}: {}", rootPath.name(), e.getMessage(), e); + log.error("Error initialising versions for {}: {}", currentPath.name(), e.getMessage(), e); } } return resolvedPathCollection; } - private String fetchHtmlContent(String url) { + private ObjectNode fetchCurrentContents(String url) { try { - return restTemplate.getForObject(url, String.class); + return retryTemplate.execute(context -> restTemplate.getForObject(url, ObjectNode.class)); } catch (RestClientException e) { log.error("Failed to fetch HTML content from URL {}: {}", url, e.getMessage()); } catch (Exception e) { @@ -83,10 +77,10 @@ private String fetchHtmlContent(String url) { return null; } - protected Map buildResolvedPaths(ArdcRootPaths rootPath, String categoryVersion, String vocabVersion) { + protected Map buildResolvedPaths(ArdcCurrentPaths currentPaths, String categoryVersion, String vocabVersion) { Map resolvedPaths = new HashMap<>(); for (VocabApiPaths vocabApiPath : VocabApiPaths.values()) { - if (rootPath.name().equals(vocabApiPath.name())) { + if (currentPaths.name().equals(vocabApiPath.name())) { resolvedPaths.put(PathName.categoryApi, String.format(vocabApiPath.getCategoryApiTemplate(), categoryVersion)); resolvedPaths.put(PathName.categoryDetailsApi, String.format(vocabApiPath.getCategoryDetailsTemplate(), categoryVersion, "%s")); resolvedPaths.put(PathName.vocabApi, String.format(vocabApiPath.getVocabApiTemplate(), vocabVersion)); @@ -96,31 +90,24 @@ protected Map buildResolvedPaths(ArdcRootPaths rootPath, Strin return resolvedPaths; } - protected static String extractVersionFromHtmlContent(String htmlContent) { - if (htmlContent != null && !htmlContent.isEmpty()) { - // Parse HTML content with Jsoup - Document doc = Jsoup.parse(htmlContent); - - // Extract the first h4 element - // has(.box-tag.box-tag-green) query will ensure to select only the div element that has "Current" indicator - Element firstH4 = doc.selectFirst("div.col-md-4.panel-body:has(.box-tag.box-tag-green) h4:first-of-type"); - - if (firstH4 != null) { - String version = firstH4.text() - .toLowerCase() - .replaceAll("[ .]", "-"); - // Validate the version format - if (version.matches(VERSION_REGEX)) { + protected String extractVersionFromCurrentContent(ObjectNode currentContent) { + if (currentContent != null && !currentContent.isEmpty()) { + JsonNode node = currentContent.get("result"); + if (!about.apply(node).isEmpty()) { + Pattern pattern = Pattern.compile(VERSION_REGEX); + Matcher matcher = pattern.matcher(about.apply(node)); + + if (matcher.find()) { + String version = matcher.group(1); log.info("Valid Version Found: {}", version); return version; } else { - log.warn("Version does not match the required format: {}", version); + log.warn("Version does not match the required format: {}", about.apply(node)); } - } else { - log.warn("No matching h4 element found in the document."); } + } else { - log.warn("HTML content is empty or null."); + log.warn("Current content is empty or null."); } return null; } diff --git a/ardcvocabs/src/test/java/au/org/aodn/ardcvocabs/service/ArdcVocabServiceImplTest.java b/ardcvocabs/src/test/java/au/org/aodn/ardcvocabs/service/ArdcVocabServiceImplTest.java index 20fa1164..8286e21e 100644 --- a/ardcvocabs/src/test/java/au/org/aodn/ardcvocabs/service/ArdcVocabServiceImplTest.java +++ b/ardcvocabs/src/test/java/au/org/aodn/ardcvocabs/service/ArdcVocabServiceImplTest.java @@ -226,36 +226,6 @@ public void init() { Mockito.reset(mockRestTemplate); } - @Test - void testFetchVersionWithCannedHtml() throws Exception { - String mockHtmlContent; - String version; - - mockHtmlContent = readResourceFile("/databag/ardc/viewById22.html"); - version = ArdcVocabServiceImpl.extractVersionFromHtmlContent(mockHtmlContent); - assertEquals("version-1-6", version, "Expected parsed version for viewById22.html is 'version-1-6'"); - - mockHtmlContent = readResourceFile("/databag/ardc/viewById24.html"); - version = ArdcVocabServiceImpl.extractVersionFromHtmlContent(mockHtmlContent); - assertEquals("version-2-1", version, "Expected parsed version for viewById24.html is 'version-2-1'"); - - mockHtmlContent = readResourceFile("/databag/ardc/viewById25.html"); - version = ArdcVocabServiceImpl.extractVersionFromHtmlContent(mockHtmlContent); - assertEquals("version-6-1", version, "Expected parsed version for viewById25.html is 'version-6-1'"); - - mockHtmlContent = readResourceFile("/databag/ardc/viewById26.html"); - version = ArdcVocabServiceImpl.extractVersionFromHtmlContent(mockHtmlContent); - assertEquals("version-1-2", version, "Expected parsed version for viewById26.html is 'version-1-2'"); - - mockHtmlContent = readResourceFile("/databag/ardc/viewById28.html"); - version = ArdcVocabServiceImpl.extractVersionFromHtmlContent(mockHtmlContent); - assertEquals("version-2-5", version, "Expected parsed version for viewById28.html is 'version-2-5'"); - - mockHtmlContent = readResourceFile("/databag/ardc/viewById29.html"); - version = ArdcVocabServiceImpl.extractVersionFromHtmlContent(mockHtmlContent); - assertEquals("version-2-5", version, "Expected parsed version for viewById29.html is 'version-2-5'"); - } - @Test public void verifyParameterVocab() throws IOException, JSONException { diff --git a/ardcvocabs/src/test/resources/databag/ardc/viewById22.html b/ardcvocabs/src/test/resources/databag/ardc/viewById22.html deleted file mode 100644 index 537cd0bb..00000000 --- a/ardcvocabs/src/test/resources/databag/ardc/viewById22.html +++ /dev/null @@ -1,1616 +0,0 @@ - - - - - - - - - - - AODN Discovery Parameter Vocabulary - Research Vocabularies Australia - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
-
-
- -
-
-
- - - - - - Using search - - - Browse all vocabularies - - - | - - - concepts - -
-
-
-
-
-
- - Help -
-
-
-
-
-
- -
-
-
- - -
-

AODN Discovery Parameter Vocabulary

- Acronym: AODN Discovery Parameters
- Publisher Australian Ocean Data Network (AODN) -
- Created: 23 Sep 2015 - 𝕏 -
-
-
-
-
-
- -
-
- -
- - -
-
-

- - Version 1.6

- current -
-
-
- - Download - -
- Access Linked Data API -
-
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-discovery-parameter-vocabulary_version-1-6 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 10 Aug 2023 view notes
- -
-
- - - - -
-
-

  Version 1.5

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-discovery-parameter-vocabulary_version-1-5 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 21 Oct 2022 view notes
- - -
-
- -
-
-

  Version 1.4

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- https://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-discovery-parameter-vocabulary_version-1-4 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 12 Dec 2018 view notes
- - -
-
- -
-
-

  Version 1.3

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- https://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-discovery-parameter-vocabulary_version-1-3 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 23 Feb 2018 view notes
- - -
-
- -
-
-

  Version 1.2

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- https://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-discovery-parameter-vocabulary_version-1-2 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 11 Aug 2016 view notes
- - -
-
- -
-
-

  Version 1.1

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- https://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-discovery-parameter-vocabulary_version-1-1 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 04 Nov 2015 view notes
- - -
-
- - - -
- - -
- -
An AODN controlled vocabulary describing discovery parameters. A classified version of the terms is used to support faceted searching in the AODN Portal (https://portal.aodn.org.au/).
-
Revision Cycle
-

Periodic

-
Languages
-

- English -

-
Licence
-

- CC-BY
-

-
-
-
-
- - -
-
-
-

- - Using browse - -

- - - - - - - - - - - - - - - - - - - - -
- - - -   - - - - - - - - - - - -
- - Concept - - - - -
-
-
- -
-
-
-
-
-
-
Use this code snippet to describe or - discover resources with - AODN Discovery Parameter Vocabulary in your system -

Example: Search for and select concepts - in this vocabulary - - -
-
Learn more
-
-
- 
-<input type="text" id="aodn-discovery-parameter-vocabulary" name="aodn-discovery-parameter-vocabulary" value="" size="80" autocomplete="off">
-<script>
-    $("#aodn-discovery-parameter-vocabulary").vocab_widget({
-        mode: 'search',
-        cache: false,
-        repository: 'http://vocabs.ardc.edu.au/repository/api/lda/aodn/aodn-discovery-parameter-vocabulary/version-1-6',
-        target_field: 'label',
-        endpoint: 'https://vocabs.ardc.edu.au/apps/vocab_widget/proxy/'
-    });
-</script>
-
-
-
- - -
-
Subjects
-
- - Marine Discovery Parameters - | - Marine - | - OCEANOGRAPHY -
-
- -
-
-
- -
-
-
Related
-
- -
Related people and organisations
- -

- - - Has contributor - eMII_Finney.Kim_Admin -

- -

- - - Has author - Sebastien Mancini -

- -

- - - Has contributor - eMII_Mancini.Sebastien -

-
-
- - -
-
Used by
-
- -
- Used by IMOS. - -
-
-
- -
-
Examples of use
-
- -
-

IMOS use this vocabulary to provide standardised entry of discovery parameter information in metadata, and these terms are utilised in the parameter facet of the AODN Portal.

- - -
-
-
- -
- - - -
- -
-
-
-
-
- -
- - - diff --git a/ardcvocabs/src/test/resources/databag/ardc/viewById24.html b/ardcvocabs/src/test/resources/databag/ardc/viewById24.html deleted file mode 100644 index 9c0d190a..00000000 --- a/ardcvocabs/src/test/resources/databag/ardc/viewById24.html +++ /dev/null @@ -1,1616 +0,0 @@ - - - - - - - - - - - AODN Parameter Category Vocabulary - Research Vocabularies Australia - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
-
-
- -
-
-
- - - - - - Using search - - - Browse all vocabularies - - - | - - - concepts - -
-
-
-
-
-
- - Help -
-
-
-
-
-
- -
-
-
- - -
-

AODN Parameter Category Vocabulary

- Acronym: AODN Parameter Categories
- Publisher Australian Ocean Data Network (AODN) -
- Created: 23 Sep 2015 - 𝕏 -
-
-
-
-
-
- -
-
- -
- - -
-
-

- - Version 2.1

- current -
-
-
- - Download - -
- Access Linked Data API -
-
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-parameter-category-vocabulary_version-2-1 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 10 Aug 2023 view notes
- -
-
- - - - -
-
-

  Version 2.0

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-parameter-category-vocabulary_version-2-0 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 21 Oct 2022 view notes
- - -
-
- -
-
-

  Version 1.4

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- https://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-parameter-category-vocabulary_version-1-4 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 11 Dec 2018 view notes
- - -
-
- -
-
-

  Version 1.3

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- https://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-parameter-category-vocabulary_version-1-3 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 27 Feb 2018 view notes
- - -
-
- -
-
-

  Version 1.2

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- https://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-parameter-category-vocabulary_version-1-2 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 23 Feb 2018 view notes
- - -
-
- -
-
-

  Version 1.1

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- https://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-parameter-category-vocabulary_version-1-1 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 11 Aug 2016 view notes
- - -
-
- - - -
- - -
- -
A classification scheme to support faceted searching across parameter types in the AODN Portal (https://portal.aodn.org.au/).
-
Revision Cycle
-

Periodic

-
Languages
-

- English -

-
Licence
-

- CC-BY
-

-
-
-
-
- - -
-
-
-

- - Using browse - -

- - - - - - - - - - - - - - - - - - - - -
- - - -   - - - - - - - - - - - -
- - Concept - - - - -
-
-
- -
-
-
-
-
-
-
Use this code snippet to describe or - discover resources with - AODN Parameter Category Vocabulary in your system -

Example: Search for and select concepts - in this vocabulary - - -
-
Learn more
-
-
- 
-<input type="text" id="aodn-parameter-category-vocabulary" name="aodn-parameter-category-vocabulary" value="" size="80" autocomplete="off">
-<script>
-    $("#aodn-parameter-category-vocabulary").vocab_widget({
-        mode: 'search',
-        cache: false,
-        repository: 'http://vocabs.ardc.edu.au/repository/api/lda/aodn/aodn-parameter-category-vocabulary/version-2-1',
-        target_field: 'label',
-        endpoint: 'https://vocabs.ardc.edu.au/apps/vocab_widget/proxy/'
-    });
-</script>
-
-
-
- - -
-
Subjects
-
- - Marine - | - Marine Parameter Categories - | - OCEANOGRAPHY -
-
- -
-
-
- -
-
-
Related
-
- -
Related people and organisations
- -

- - - Has contributor - eMII_Finney.Kim_Admin -

- -

- - - Has author - Sebastien Mancini -

- -

- - - Has contributor - eMII_Mancini.Sebastien -

-
-
- - -
-
Used by
-
- -
- Used by IMOS. - -
-
-
- -
-
Examples of use
-
- -
-

IMOS use this vocabulary to provide high level classification of parameters in the AODN Portal.

- - -
-
-
- -
- - - -
- -
-
-
-
-
- -
- - - diff --git a/ardcvocabs/src/test/resources/databag/ardc/viewById25.html b/ardcvocabs/src/test/resources/databag/ardc/viewById25.html deleted file mode 100644 index 48cadb5d..00000000 --- a/ardcvocabs/src/test/resources/databag/ardc/viewById25.html +++ /dev/null @@ -1,4446 +0,0 @@ - - - - - - - - - - - AODN Platform Vocabulary - Research Vocabularies Australia - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
-
-
- -
-
-
- - - - - - Using search - - - Browse all vocabularies - - - | - - - concepts - -
-
-
-
-
-
- - Help -
-
-
-
-
-
- -
-
-
- - -
-

AODN Platform Vocabulary

- Acronym: AODN Platforms
- Publisher Australian Ocean Data Network (AODN) -
- Created: 23 Sep 2015 - 𝕏 -
-
-
-
-
-
- -
-
- -
- - -
-
-

- - Version 6.1

- current -
-
-
- - Download - -
- Access Linked Data API -
-
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-platform-vocabulary_version-6-1 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 24 Jul 2024 view notes
- -
-
- - - - -
-
-

  Version 6.0

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-platform-vocabulary_version-6-0 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 15 Mar 2024 view notes
- - -
-
- -
-
-

  Version 5.5

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-platform-vocabulary_version-5-5 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 17 Oct 2023 view notes
- - -
-
- -
-
-

  Version 5.4

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-platform-vocabulary_version-5-4 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 28 Aug 2023 view notes
- - -
-
- -
-
-

  Version 5.3

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-platform-vocabulary_version-5-3 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 05 Jul 2023 view notes
- - -
-
- -
-
-

  Version 5.2

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-platform-vocabulary_version-5-2 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 30 Mar 2023 view notes
- - -
-
- - - -
- - -
- -
An AODN controlled vocabulary describing platforms. A classified version of the terms is used to support faceted searching in the AODN Portal (https://portal.aodn.org.au/).
-
Revision Cycle
-

Periodic

-
Languages
-

- English -

-
Licence
-

- CC-BY
-

-
-
-
-
- - -
-
-
-

- - Using browse - -

- - - - - - - - - - - - - - - - - - - - -
- - - -   - - - - - - - - - - - -
- - Concept - - - - -
-
-
- -
-
-
-
-
-
-
Use this code snippet to describe or - discover resources with - AODN Platform Vocabulary in your system -

Example: Search for and select concepts - in this vocabulary - - -
-
Learn more
-
-
- 
-<input type="text" id="aodn-platform-vocabulary" name="aodn-platform-vocabulary" value="" size="80" autocomplete="off">
-<script>
-    $("#aodn-platform-vocabulary").vocab_widget({
-        mode: 'search',
-        cache: false,
-        repository: 'http://vocabs.ardc.edu.au/repository/api/lda/aodn/aodn-platform-vocabulary/version-6-1',
-        target_field: 'label',
-        endpoint: 'https://vocabs.ardc.edu.au/apps/vocab_widget/proxy/'
-    });
-</script>
-
-
-
- - -
-
Subjects
-
- - Marine - | - Marine Platforms - | - OCEANOGRAPHY -
-
- -
-
-
- -
-
-
Related
-
- -
Related people and organisations
- -

- - - Has contributor - eMII_Finney.Kim_Admin -

- -

- - - Has contributor - Natalia_Atkins -

- -

- - - Has author - Sebastien Mancini -

- -

- - - Has contributor - eMII_Atkins.Natalia -

- -

- - - Has contributor - Kim_Finney -

-
-
- - -
-
Used by
-
- -
- Used by IMOS. - -
-
-
- -
-
Examples of use
-
- -
-

IMOS use this vocabulary to provide standardised entry of instrument information in metadata, and these terms are utilised in the platform facet of the AODN Portal. The vocabulary also provides a check for data ingestion in several IMOS Sub-facilities.

- - -
-
-
- -
- - - -
- -
-
-
-
-
- -
- - - diff --git a/ardcvocabs/src/test/resources/databag/ardc/viewById26.html b/ardcvocabs/src/test/resources/databag/ardc/viewById26.html deleted file mode 100644 index 19dd4c78..00000000 --- a/ardcvocabs/src/test/resources/databag/ardc/viewById26.html +++ /dev/null @@ -1,1189 +0,0 @@ - - - - - - - - - - - AODN Platform Category Vocabulary - Research Vocabularies Australia - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
-
-
- -
-
-
- - - - - - Using search - - - Browse all vocabularies - - - | - - - concepts - -
-
-
-
-
-
- - Help -
-
-
-
-
-
- -
-
-
- - -
-

AODN Platform Category Vocabulary

- Acronym: AODN Platform Categories
- Publisher Australian Ocean Data Network (AODN) -
- Created: 23 Sep 2015 - 𝕏 -
-
-
-
-
-
- -
-
- -
- - -
-
-

- - Version 1.2

- current -
-
-
- - Download - -
- Access Linked Data API -
-
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- https://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-platform-category-vocabulary_version-1-2 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 02 Jan 2020 view notes
- -
-
- - - - -
-
-

  Version 1.1

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- https://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-platform-category-vocabulary_version-1-1 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 03 Jul 2017 view notes
- - -
-
- -
-
-

  Version 1.0

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- https://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-platform-category-vocabulary_version-1-0 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 23 Sep 2015
- - -
-
- -
- - -
- -
A classification scheme to support faceted searching across platform types in the AODN Portal (https://portal.aodn.org.au/).
-
Revision Cycle
-

Periodic

-
Languages
-

- English -

-
Licence
-

- CC-BY
-

-
-
-
-
- - -
-
-
-

- - Using browse - -

- - - - - - - - - - - - - - - - - - - - -
- - - -   - - - - - - - - - - - -
- - Concept - - - - -
-
-
- -
-
-
-
-
-
-
Use this code snippet to describe or - discover resources with - AODN Platform Category Vocabulary in your system -

Example: Search for and select concepts - in this vocabulary - - -
-
Learn more
-
-
- 
-<input type="text" id="aodn-platform-category-vocabulary" name="aodn-platform-category-vocabulary" value="" size="80" autocomplete="off">
-<script>
-    $("#aodn-platform-category-vocabulary").vocab_widget({
-        mode: 'search',
-        cache: false,
-        repository: 'http://vocabs.ardc.edu.au/repository/api/lda/aodn/aodn-platform-category-vocabulary/version-1-2',
-        target_field: 'label',
-        endpoint: 'https://vocabs.ardc.edu.au/apps/vocab_widget/proxy/'
-    });
-</script>
-
-
-
- - -
-
Subjects
-
- - Marine Platform Categories - | - Marine - | - OCEANOGRAPHY -
-
- -
-
-
- -
-
-
Related
-
- -
Related people and organisations
- -

- - - Has contributor - eMII_Finney.Kim_Admin -

- -

- - - Has contributor - Natalia_Atkins -

- -

- - - Has author - Sebastien Mancini -

- -

- - - Has contributor - eMII_Atkins.Natalia -

-
-
- - -
-
Used by
-
- - -
-
- -
-
Examples of use
-
- -
-

Department of Climate Change, Energy, the Environment and Water use this vocabulary to describe research outputs for reporting, search and discovery.

-

IMOS use this vocabulary to provide high level classification of platforms in the AODN Portal.

- - -
-
-
- -
- - - -
- -
-
-
-
-
- -
- - - diff --git a/ardcvocabs/src/test/resources/databag/ardc/viewById28.html b/ardcvocabs/src/test/resources/databag/ardc/viewById28.html deleted file mode 100644 index 1ddc76d1..00000000 --- a/ardcvocabs/src/test/resources/databag/ardc/viewById28.html +++ /dev/null @@ -1,2109 +0,0 @@ - - - - - - - - - - - AODN Organisation Vocabulary - Research Vocabularies Australia - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
-
-
- -
-
-
- - - - - - Using search - - - Browse all vocabularies - - - | - - - concepts - -
-
-
-
-
-
- - Help -
-
-
-
-
-
- -
-
-
- - -
-

AODN Organisation Vocabulary

- Acronym: AODN Organisations
- Publisher Australian Ocean Data Network (AODN) -
- Created: 23 Sep 2015 - 𝕏 -
-
-
-
-
-
- -
-
- -
- - -
-
-

- - Version 2.5

- current -
-
-
- - Download - -
- Access Linked Data API -
-
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-organisation-vocabulary_version-2-5 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 10 Nov 2023 view notes
- -
-
- - - - -
-
-

  Version 2.4

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-organisation-vocabulary_version-2-4 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 18 Jan 2023 view notes
- - -
-
- -
-
-

  Version 2.3

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-organisation-vocabulary_version-2-3 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 13 Aug 2021 view notes
- - -
-
- -
-
-

  Version 2.2

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-organisation-vocabulary_version-2-2 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 16 Sep 2020 view notes
- - -
-
- -
-
-

  Version 2.1

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- https://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-organisation-vocabulary_version-2-1 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 07 Jan 2020 view notes
- - -
-
- -
-
-

  Version 2.0

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- https://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-organisation-vocabulary_version-2-0 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 27 Nov 2018 view notes
- - -
-
- - - -
- - -
- -
An AODN controlled vocabulary describing organisational entities. A classified version of the terms is used to support faceted searching in the AODN Portal (https://portal.aodn.org.au/).
-
Revision Cycle
-

Periodic

-
Languages
-

- English -

-
Licence
-

- CC-BY
-

-
-
-
-
- - -
-
-
-

- - Using browse - -

- - - - - - - - - - - - - - - - - - - - -
- - - -   - - - - - - - - - - - -
- - Concept - - - - -
-
-
- -
-
-
-
-
-
-
Use this code snippet to describe or - discover resources with - AODN Organisation Vocabulary in your system -

Example: Search for and select concepts - in this vocabulary - - -
-
Learn more
-
-
- 
-<input type="text" id="aodn-organisation-vocabulary" name="aodn-organisation-vocabulary" value="" size="80" autocomplete="off">
-<script>
-    $("#aodn-organisation-vocabulary").vocab_widget({
-        mode: 'search',
-        cache: false,
-        repository: 'http://vocabs.ardc.edu.au/repository/api/lda/aodn/aodn-organisation-vocabulary/version-2-5',
-        target_field: 'label',
-        endpoint: 'https://vocabs.ardc.edu.au/apps/vocab_widget/proxy/'
-    });
-</script>
-
-
-
- - -
-
Subjects
-
- - Marine Organisations - | - Marine - | - OCEANOGRAPHY -
-
- -
-
-
- -
-
-
Related
-
- -
Related people and organisations
- -

- - - Has contributor - eMII_Finney.Kim -

- -

- - - Has author - Natalia Atkins -

- -

- - - Has contributor - Natalia_Atkins -

- -

- - - Has contributor - eMII_Atkins.Natalia -

-
-
- - -
-
Used by
-
- -
- Used by IMOS. - -
-
-
- -
-
Examples of use
-
- -
-

IMOS use this vocabulary to provide consistent entry of organisation details in metadata, and to support faceted searching in the AODN Portal.

- - -
-
-
- -
- - - -
- -
-
-
-
-
- -
- - - diff --git a/ardcvocabs/src/test/resources/databag/ardc/viewById29.html b/ardcvocabs/src/test/resources/databag/ardc/viewById29.html deleted file mode 100644 index 7369e55c..00000000 --- a/ardcvocabs/src/test/resources/databag/ardc/viewById29.html +++ /dev/null @@ -1,2153 +0,0 @@ - - - - - - - - - - - AODN Organisation Category Vocabulary - Research Vocabularies Australia - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
-
-
- -
-
-
- - - - - - Using search - - - Browse all vocabularies - - - | - - - concepts - -
-
-
-
-
-
- - Help -
-
-
-
-
-
- -
-
-
- - -
-

AODN Organisation Category Vocabulary

- Acronym: AODN Organisation Categories
- Publisher Australian Ocean Data Network (AODN) -
- Created: 23 Sep 2015 - 𝕏 -
-
-
-
-
-
- -
-
- -
- - -
-
-

- - Version 2.5

- current -
-
-
- - Download - -
- Access Linked Data API -
-
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-organisation-category-vocabulary_version-2-5 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 10 Nov 2023 view notes
- -
-
- - - - -
-
-

  Version 2.4

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-organisation-category-vocabulary_version-2-4 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 18 Jan 2023 view notes
- - -
-
- -
-
-

  Version 2.3

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-organisation-category-vocabulary_version-2-3 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 13 Aug 2021 view notes
- - -
-
- -
-
-

  Version 2.2

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- http://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-organisation-category-vocabulary_version-2-2 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 16 Sep 2020 view notes
- - -
-
- -
-
-

  Version 2.1

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- https://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-organisation-category-vocabulary_version-2-1 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 07 Jan 2020 view notes
- - -
-
- -
-
-

  Version 2.0

- superseded -
-
-
- Download - - - -
- Access Linked Data API -
- -
-
- Show SPARQL Endpoint -
-
- SPARQL Endpoint: -

- https://vocabs.ardc.edu.au/repository/api/sparql/aodn_aodn-organisation-category-vocabulary_version-2-0 -
- - Open SPARQL Endpoint in YASGUI - -
- Learn More -

-
-
-
- released: 27 Nov 2018 view notes
- - -
-
- - - -
- - -
- -
An AODN controlled vocabulary describing organisation categories for classifying organisational entities, to support faceted searching in the AODN Portal (https://portal.aodn.org.au/).
-
Revision Cycle
-

Periodic

-
Languages
-

- English -

-
Licence
-

- CC-BY
-

-
-
-
-
- - -
-
-
-

- - Using browse - -

- - - - - - - - - - - - - - - - - - - - -
- - - -   - - - - - - - - - - - -
- - Concept - - - - -
-
-
- -
-
-
-
-
-
-
Use this code snippet to describe or - discover resources with - AODN Organisation Category Vocabulary in your system -

Example: Search for and select concepts - in this vocabulary - - -
-
Learn more
-
-
- 
-<input type="text" id="aodn-organisation-category-vocabulary" name="aodn-organisation-category-vocabulary" value="" size="80" autocomplete="off">
-<script>
-    $("#aodn-organisation-category-vocabulary").vocab_widget({
-        mode: 'search',
-        cache: false,
-        repository: 'http://vocabs.ardc.edu.au/repository/api/lda/aodn/aodn-organisation-category-vocabulary/version-2-5',
-        target_field: 'label',
-        endpoint: 'https://vocabs.ardc.edu.au/apps/vocab_widget/proxy/'
-    });
-</script>
-
-
-
- - -
-
Subjects
-
- - Marine - | - Marine Organisation Categories - | - OCEANOGRAPHY -
-
- -
-
-
- -
-
-
Related
-
- -
Related people and organisations
- -

- - - Has author - Natalia Atkins -

- -

- - - Has contributor - Sebastien Mancini -

-
-
- - -
-
Used by
-
- -
- Used by IMOS. - -
-
-
- -
-
Examples of use
-
- -
-

IMOS use this vocabulary to provide high level classification of organisations in the AODN Portal.

- - -
-
-
- -
- - - -
- -
-
-
-
-
- -
- - -