CSPACE-3756,CSPACE-3875: Revised CollectionObject / Cataloging schema in the services...

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
index 1751e267ba7b012a9caddcdf80a8f3ba5ff590e3..fcc08c8bd557d42ad7e142f373eedb4bcbb1e3d7 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
@@ -547,17 +547,24 @@
 \r
     <xs:complexType name="objectProductionDateGroup">\r
         <xs:sequence>\r
-            <xs:element name="dateText" type="xs:string"/>\r
+            <xs:element name="displayDate" type="xs:string"/>\r
             <xs:element name="dateAssociation" type="xs:string"/>\r
+            <xs:element name="dateEarliestSingleYear" type="xs:string"/>\r
+            <xs:element name="dateEarliestSingleMonth" type="xs:string"/>\r
+            <xs:element name="dateEarliestSingleDay" type="xs:string"/>\r
+            <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>\r
+            <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>\r
+            <xs:element name="dateEarliestSingleQualifierValue" type="xs:string"/>\r
+            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>\r
+            <xs:element name="dateLatestYear" type="xs:string"/>\r
+            <xs:element name="dateLatestMonth" type="xs:string"/>\r
+            <xs:element name="dateLatestDay" type="xs:string"/>\r
+            <xs:element name="dateLatestCertainty" type="xs:string"/>\r
+            <xs:element name="dateLatestQualifier" type="xs:string"/>\r
+            <xs:element name="dateLatestQualifierValue" type="xs:string"/>\r
+            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>\r
             <xs:element name="datePeriod" type="xs:string"/>\r
-            <xs:element name="dateSingleOrRangeStart" type="xs:string"/>\r
-            <xs:element name="dateSingleOrRangeStartCertainty" type="xs:string"/>\r
-            <xs:element name="dateSingleOrRangeStartQualifier" type="xs:string"/>\r
-            <xs:element name="dateSingleOrRangeStartQualifierValue" type="xs:string"/>\r
-            <xs:element name="dateRangeEnd" type="xs:string"/>\r
-            <xs:element name="dateRangeEndCertainty" type="xs:string"/>\r
-            <xs:element name="dateRangeEndQualifier" type="xs:string"/>\r
-            <xs:element name="dateRangeEndQualifierValue" type="xs:string"/>\r
+            <xs:element name="dateNote" type="xs:string"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
 \r

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index a66e79e9a96d2930c8472dcb6d0aa0b0ba96770a..960aea23124cfb4ec76e0744b36426b938eb8a30 100644 (file)
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -485,17 +485,26 @@
 
     <xs:complexType name="objectProductionDateGroup">
         <xs:sequence>
-            <xs:element name="dateText" type="xs:string"/>
+            <xs:element name="displayDate" type="xs:string"/>
             <xs:element name="dateAssociation" type="xs:string"/>
+            <xs:element name="dateEarliestSingleYear" type="xs:string"/>
+            <xs:element name="dateEarliestSingleMonth" type="xs:string"/>
+            <xs:element name="dateEarliestSingleDay" type="xs:string"/>
+            <xs:element name="dateEarliestSingleEra" type="xs:string"/>
+            <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>
+            <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>
+            <xs:element name="dateEarliestSingleQualifierValue" type="xs:string"/>
+            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>
+            <xs:element name="dateLatestYear" type="xs:string"/>
+            <xs:element name="dateLatestMonth" type="xs:string"/>
+            <xs:element name="dateLatestDay" type="xs:string"/>
+            <xs:element name="dateLatestEra" type="xs:string"/>
+            <xs:element name="dateLatestCertainty" type="xs:string"/>
+            <xs:element name="dateLatestQualifier" type="xs:string"/>
+            <xs:element name="dateLatestQualifierValue" type="xs:string"/>
+            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>
             <xs:element name="datePeriod" type="xs:string"/>
-            <xs:element name="dateSingleOrRangeStart" type="xs:string"/>
-            <xs:element name="dateSingleOrRangeStartCertainty" type="xs:string"/>
-            <xs:element name="dateSingleOrRangeStartQualifier" type="xs:string"/>
-            <xs:element name="dateSingleOrRangeStartQualifierValue" type="xs:string"/>
-            <xs:element name="dateRangeEnd" type="xs:string"/>
-            <xs:element name="dateRangeEndCertainty" type="xs:string"/>
-            <xs:element name="dateRangeEndQualifier" type="xs:string"/>
-            <xs:element name="dateRangeEndQualifierValue" type="xs:string"/>
+            <xs:element name="dateNote" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>