#24 Add distribution download URL

gbif · Jul 29, 2024 · 1549632 · 1549632
1 parent 2272b82
commit 1549632
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 1 deletion.
diff --git a/gbif-metadata-profile-eml/src/main/java/org/gbif/metadata/eml/ipt/EmlFactory.java b/gbif-metadata-profile-eml/src/main/java/org/gbif/metadata/eml/ipt/EmlFactory.java
@@ -153,7 +153,11 @@ public static Eml build(InputStream xml)
         "eml/dataset/methods/sampling/samplingDescription/para", "sampleDescription");
     digester.addBeanPropertySetter(
         "eml/dataset/methods/qualityControl/description/para", "qualityControl");
-    digester.addBeanPropertySetter("eml/dataset/distribution/online/url", "distributionUrl");
+
+    digester.addCallMethod("eml/dataset/distribution/online/url", "setDistribution", 2);
+    digester.addCallParam("eml/dataset/distribution/online/url", 0);
+    digester.addCallParam("eml/dataset/distribution/online/url", 1, "function");
+
     digester.addBeanPropertySetter("eml/dataset/purpose/para", "purpose");
     digester.addBeanPropertySetter(
         "eml/dataset/maintenance/description/para", "updateFrequencyDescription");

diff --git a/gbif-metadata-profile-eml/src/main/java/org/gbif/metadata/eml/ipt/model/Eml.java b/gbif-metadata-profile-eml/src/main/java/org/gbif/metadata/eml/ipt/model/Eml.java
@@ -149,6 +149,10 @@ public class Eml implements Serializable {
    * to "information".
    */
   private String distributionUrl;
+  /**
+   * Download URL
+   */
+  private String distributionDownloadUrl;
   /**
    * Serialised data
    */
@@ -474,6 +478,25 @@ public void setDistributionUrl(String distributionUrl) {
     this.distributionUrl = distributionUrl;
   }
 
+  public String getDistributionDownloadUrl() {
+    if (distributionDownloadUrl == null || distributionDownloadUrl.isEmpty()) {
+      return null;
+    }
+    return distributionDownloadUrl;
+  }
+
+  public void setDistributionDownloadUrl(String distributionDownloadUrl) {
+    this.distributionDownloadUrl = distributionDownloadUrl;
+  }
+
+  public void setDistribution(String distribution, String function) {
+    if ("information".equals(function)) {
+      setDistributionUrl(distribution);
+    } else if ("download".equals(function)) {
+      setDistributionDownloadUrl(distribution);
+    }
+  }
+
   public BigDecimal getEmlVersion() {
     return emlVersion;
   }
@@ -1217,6 +1240,7 @@ public boolean equals(Object o) {
         && Objects.equals(citation, eml.citation)
         && Objects.equals(dateStamp, eml.dateStamp)
         && Objects.equals(distributionUrl, eml.distributionUrl)
+        && Objects.equals(distributionDownloadUrl, eml.distributionDownloadUrl)
         && Objects.equals(emlVersion, eml.emlVersion)
         && Objects.equals(previousEmlVersion, eml.previousEmlVersion)
         && Objects.equals(geospatialCoverages, eml.geospatialCoverages)
@@ -1262,6 +1286,7 @@ public int hashCode() {
         citation,
         dateStamp,
         distributionUrl,
+        distributionDownloadUrl,
         emlVersion,
         previousEmlVersion,
         majorVersion,
@@ -1309,6 +1334,7 @@ public String toString() {
         .add("citation=" + citation)
         .add("dateStamp=" + dateStamp)
         .add("distributionUrl='" + distributionUrl + "'")
+        .add("distributionDownloadUrl='" + distributionDownloadUrl + "'")
         .add("emlVersion=" + emlVersion)
         .add("previousEmlVersion=" + previousEmlVersion)
         .add("majorVersion=" + majorVersion)

diff --git a/gbif-metadata-profile-eml/src/main/resources/templates/eml-ipt.ftl b/gbif-metadata-profile-eml/src/main/resources/templates/eml-ipt.ftl
@@ -288,6 +288,13 @@
             </online>
         </distribution>
         </#if>
+        <#if (eml.getDistributionDownloadUrl())??>
+        <distribution scope="document">
+            <online>
+                <url function="download">${eml.distributionDownloadUrl!}</url>
+            </online>
+        </distribution>
+        </#if>
         <#if ((eml.geospatialCoverages ? size > 0)
         ||  (eml.taxonomicCoverages ? size > 0)
         ||  (eml.temporalCoverages ? size > 0))>

diff --git a/gbif-metadata-profile-eml/src/test/java/org/gbif/metadata/eml/ipt/EmlFactoryTest.java b/gbif-metadata-profile-eml/src/test/java/org/gbif/metadata/eml/ipt/EmlFactoryTest.java
@@ -243,6 +243,10 @@ public void testBuild() {
       assertNotNull(eml.getDistributionUrl());
       assertEquals("http://www.any.org/fauna/coleoptera/beetleList.html", eml.getDistributionUrl());
 
+      // download URL
+      assertNotNull(eml.getDistributionDownloadUrl());
+      assertEquals("https://ipt.gbif.org/archive.do?r=res", eml.getDistributionDownloadUrl());
+
       // geospatial coverages tests
       assertNotNull(eml.getGeospatialCoverages());
       assertEquals(2, eml.getGeospatialCoverages().size());

diff --git a/gbif-metadata-profile-eml/src/test/resources/eml/ipt/sample.xml b/gbif-metadata-profile-eml/src/test/resources/eml/ipt/sample.xml
@@ -130,6 +130,11 @@
                 </url>
             </online>
         </distribution>
+        <distribution scope="document">
+            <online>
+                <url function="download">https://ipt.gbif.org/archive.do?r=res</url>
+            </online>
+        </distribution>
 
         <!-- 3 types of coverage are supported with example repetition -->
         <coverage>