CSPACE-3765: Added a structured date group of fields to the Object Production Date...

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 70f7d15315dfe3d31a2c7d6db02f38ac5a5dada4..1751e267ba7b012a9caddcdf80a8f3ba5ff590e3 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
@@ -216,6 +216,17 @@
 \r
     <!-- Object Production Information -->\r
 \r
+    <!--\r
+        The Object Production Date field is being transitioned to be a\r
+        structured date, per CSPACE-3756.\r
+\r
+        The original multivalued / repeating text field, objectProductionDates,\r
+        is being retained here for backwards compatibility, for now.  When the\r
+        objectProductionDateGroup is implemented across layers, and is additionally\r
+        made multivalued - in the services schemae, by wrapping it in a parent\r
+        objectProductionDateGroupList element - the legacy objectProductionDates\r
+        element can then be removed.\r
+    -->\r
     <xs:element name="objectProductionDates">\r
         <xs:complexType>\r
             <xs:sequence>\r
@@ -223,6 +234,8 @@
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
+    <xs:element name="objectProductionDateGroup" type="objectProductionDateGroup"/>\r
+\r
     <xs:element name="objectProductionNote" type="xs:string"/>\r
     <xs:element name="objectProductionOrganizationGroupList" type="objectProductionOrganizationGroupList"/>\r
     <xs:element name="objectProductionPeopleGroupList" type="objectProductionPeopleGroupList"/>\r
@@ -532,6 +545,22 @@
         </xs:sequence>\r
     </xs:complexType>\r
 \r
+    <xs:complexType name="objectProductionDateGroup">\r
+        <xs:sequence>\r
+            <xs:element name="dateText" type="xs:string"/>\r
+            <xs:element name="dateAssociation" 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:sequence>\r
+    </xs:complexType>\r
+\r
     <xs:complexType name="objectProductionOrganizationGroupList">\r
         <xs:sequence>\r
             <xs:element name="objectProductionOrganizationGroup" type="objectProductionOrganizationGroup" minOccurs="0"\r

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index fd341593df36e41484b217a0749ce0cf98d3dd97..a66e79e9a96d2930c8472dcb6d0aa0b0ba96770a 100644 (file)
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -133,7 +133,21 @@
                 <xs:element name="objectComponentGroupList" type="objectComponentGroupList"/>
 
                 <!-- Object Production Information -->
+
+                <!--
+                    The Object Production Date field is being transitioned to be a
+                    structured date, per CSPACE-3756.
+
+                    The original multivalued / repeating text field, objectProductionDates,
+                    is being retained here for backwards compatibility, for now.  When the
+                    objectProductionDateGroup is implemented across layers, and is additionally
+                    made multivalued - in the services schemae, by wrapping it in a parent
+                    objectProductionDateGroupList element - the legacy objectProductionDates
+                    element can then be removed.
+                -->
                 <xs:element name="objectProductionDates" type="objectProductionDateList"/>
+                <xs:element name="objectProductionDateGroup" type="objectProductionDateGroup"/>
+
                 <xs:element name="objectProductionNote" type="xs:string"/>
                 <xs:element name="objectProductionOrganizationGroupList" type="objectProductionOrganizationGroupList"/>
                 <xs:element name="objectProductionPeopleGroupList" type="objectProductionPeopleGroupList"/>
@@ -469,6 +483,22 @@
         </xs:sequence>
     </xs:complexType>
 
+    <xs:complexType name="objectProductionDateGroup">
+        <xs:sequence>
+            <xs:element name="dateText" type="xs:string"/>
+            <xs:element name="dateAssociation" 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:sequence>
+    </xs:complexType>
+
     <xs:complexType name="objectProductionOrganizationGroupList">
         <xs:sequence>
             <xs:element name="objectProductionOrganizationGroup" type="objectProductionOrganizationGroup" minOccurs="0"