CMR-7751 adding URLContentType parsing for ISO records in the distrib…

…ution section. (#1350)
nasa · Sep 28, 2021 · a3f6e66 · a3f6e66
1 parent 448be17
commit a3f6e66
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/umm-spec-lib/resources/example-data/error-cases/CMR-5366.xml b/umm-spec-lib/resources/example-data/error-cases/CMR-5366.xml
@@ -1225,6 +1225,22 @@
                                     </gmd:function>
                                 </gmd:CI_OnlineResource>
                             </gmd:onLine>
+                            <gmd:onLine>
+                                <gmd:CI_OnlineResource>
+                                    <gmd:linkage>
+                                        <gmd:URL>https://search.earthdata.nasa.gov/search?q=MOD10A1</gmd:URL>
+                                    </gmd:linkage>
+                                    <gmd:name>
+                                        <gco:CharacterString>Earthdata Search</gco:CharacterString>
+                                    </gmd:name>
+                                    <gmd:description>
+                                        <gco:CharacterString>URLContentType: CollectionURL Description: Project Home Page. Type: PROJECT HOME PAGE</gco:CharacterString>
+                                    </gmd:description>
+                                    <gmd:function>
+                                        <gmd:CI_OnLineFunctionCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode" codeListValue="function">download</gmd:CI_OnLineFunctionCode>
+                                    </gmd:function>
+                                </gmd:CI_OnlineResource>
+                            </gmd:onLine>
                         </gmd:MD_DigitalTransferOptions>
                     </gmd:distributorTransferOptions>
                 </gmd:MD_Distributor>

diff --git a/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/iso_shared/distributions_related_url.clj b/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/iso_shared/distributions_related_url.clj
@@ -110,7 +110,8 @@
         :when (not (= href-type "DirectDistributionInformation"))]
     (merge
      {:URL url-link
-      :URLContentType "DistributionURL"
+      :URLContentType (or (:URLContentType types-and-desc)
+                          "DistributionURL")
       :Type type
       :Subtype (if opendap-type
                 "OPENDAP DATA (DODS)"

diff --git a/...c-lib/test/cmr/umm_spec/test/xml_to_umm_mappings/iso_shared/distributions_related_url.clj b/...c-lib/test/cmr/umm_spec/test/xml_to_umm_mappings/iso_shared/distributions_related_url.clj
@@ -139,7 +139,12 @@
       :Unit "KB",
       :Fees nil,
       :Checksum nil,
-      :MimeType nil}}))
+      :MimeType nil}}
+    {:URL "https://search.earthdata.nasa.gov/search?q=MOD10A1",
+     :URLContentType "CollectionURL",
+     :Type "PROJECT HOME PAGE",
+     :Subtype nil,
+     :Description "Project Home Page."}))
 
 (defn- distribution-related-url-iso-mends-record
   "Returns an example ISO19115 metadata record that includes multiple related urls