From 5209bc5aa6d58073091c99610bf43fec43d70ffc Mon Sep 17 00:00:00 2001 From: jmaeng72 <44305062+jmaeng72@users.noreply.github.com> Date: Tue, 29 Oct 2024 11:21:41 -0400 Subject: [PATCH] update translations --- umm-lib/resources/schema/dif10/UmmCommon_1.2.xsd | 2 ++ umm-lib/resources/schema/echo10/MetadataCommon.xsd | 2 ++ .../src/cmr/umm_spec/umm_to_xml_mappings/dif10.clj | 2 -- umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/dif9.clj | 1 - .../src/cmr/umm_spec/xml_to_umm_mappings/echo10.clj | 5 ++++- .../src/cmr/umm_spec/xml_to_umm_mappings/iso19115_2.clj | 7 +++++-- .../src/cmr/umm_spec/xml_to_umm_mappings/iso_smap.clj | 5 ++++- 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/umm-lib/resources/schema/dif10/UmmCommon_1.2.xsd b/umm-lib/resources/schema/dif10/UmmCommon_1.2.xsd index 492b1a8e6f..c8cbeb34bf 100644 --- a/umm-lib/resources/schema/dif10/UmmCommon_1.2.xsd +++ b/umm-lib/resources/schema/dif10/UmmCommon_1.2.xsd @@ -580,6 +580,8 @@ technical contact + + diff --git a/umm-lib/resources/schema/echo10/MetadataCommon.xsd b/umm-lib/resources/schema/echo10/MetadataCommon.xsd index a5229a6337..56f00f498b 100644 --- a/umm-lib/resources/schema/echo10/MetadataCommon.xsd +++ b/umm-lib/resources/schema/echo10/MetadataCommon.xsd @@ -817,6 +817,8 @@ + + diff --git a/umm-spec-lib/src/cmr/umm_spec/umm_to_xml_mappings/dif10.clj b/umm-spec-lib/src/cmr/umm_spec/umm_to_xml_mappings/dif10.clj index aa8066115c..5aace79641 100644 --- a/umm-spec-lib/src/cmr/umm_spec/umm_to_xml_mappings/dif10.clj +++ b/umm-spec-lib/src/cmr/umm_spec/umm_to_xml_mappings/dif10.clj @@ -13,14 +13,12 @@ [cmr.umm-spec.umm-to-xml-mappings.dif10.spatial :as spatial] [cmr.umm-spec.util :as u])) -;; TODO? (def coll-progress-mapping "Mapping from known collection progress values to values supported for DIF10 Dataset_Progress." {"COMPLETE" "COMPLETE" "ACTIVE" "IN WORK" "PLANNED" "PLANNED" "DEPRECATED" "COMPLETE" - "NOT PROVIDED" "NOT PROVIDED" "PREPRINT" "PREPRINT" "INREVIEW" "INREVIEW" "SUPERSEDED" "SUPERSEDED" diff --git a/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/dif9.clj b/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/dif9.clj index 49898ca248..01cf4c56fd 100644 --- a/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/dif9.clj +++ b/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/dif9.clj @@ -19,7 +19,6 @@ [cmr.umm-spec.versioning :as umm-spec-versioning] [cmr.umm.dif.date-util :refer [parse-dif-end-date]])) -;; TODO (def coll-progress-mapping "Mapping from values supported for DIF9 Data_Set_Progress to UMM CollectionProgress." {"COMPLETE" "COMPLETE" diff --git a/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/echo10.clj b/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/echo10.clj index f90c7339c3..4141e158fb 100644 --- a/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/echo10.clj +++ b/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/echo10.clj @@ -31,7 +31,10 @@ "ACTIVE" "ACTIVE" "PLANNED" "PLANNED" "DEPRECATED" "DEPRECATED" - "NOT APPLICABLE" "NOT APPLICABLE"}) + "NOT APPLICABLE" "NOT APPLICABLE" + "PREPRINT" "PREPRINT" + "INREVIEW" "INREVIEW" + "SUPERSEDED" "SUPERSEDED"}) (defn fields-from-temporal-resolution "Get the TemporalResolution and change the Value to number." diff --git a/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/iso19115_2.clj b/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/iso19115_2.clj index b566c00fd1..09c69ac5ba 100644 --- a/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/iso19115_2.clj +++ b/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/iso19115_2.clj @@ -30,7 +30,7 @@ [cmr.umm-spec.xml-to-umm-mappings.iso19115-2.tiling-system :as tiling] [cmr.umm-spec.versioning :as umm-spec-versioning])) -;; TODO +;; TODO ISO doesn't have any mappings for inreview, preprint, and superseded in the docs, is that correct? (def coll-progress-mapping "Mapping from values supported for ISO19115 ProgressCode to UMM CollectionProgress." {"COMPLETED" "COMPLETE" @@ -41,7 +41,10 @@ "ONGOING" "ACTIVE" "PLANNED" "PLANNED" "UNDERDEVELOPMENT" "PLANNED" - "NOT APPLICABLE" "NOT APPLICABLE"}) + "INREVIEW" "INREVIEW" + "SUPERSEDED" "SUPERSEDED" + "PREPRINT" "PREPRINT" + "NOT APPLICABLE" "NOT PROVIDED"}) (def md-data-id-base-xpath "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification") diff --git a/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/iso_smap.clj b/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/iso_smap.clj index 671cca67f7..f62e5869fc 100644 --- a/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/iso_smap.clj +++ b/umm-spec-lib/src/cmr/umm_spec/xml_to_umm_mappings/iso_smap.clj @@ -33,7 +33,10 @@ "ONGOING" "ACTIVE" "PLANNED" "PLANNED" "UNDERDEVELOPMENT" "PLANNED" - "NOT APPLICABLE" "NOT APPLICABLE"}) + "INREVIEW" "INREVIEW" + "SUPERSEDED" "SUPERSEDED" + "PREPRINT" "PREPRINT" + "NOT APPLICABLE" "NOT PROVIDED"}) (def md-identification-base-xpath (str "/gmd:DS_Series/gmd:seriesMetadata/gmi:MI_Metadata"