From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 31 Mar 2011 21:35:09 +0000 (+0000)
Subject: CSPACE-3765: Added a structured date group of fields to the Object Production Date... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=7627a4b06104eeb9fcb85b5f5feff9b048a9db2c;p=tmp%2Fjakarta-migration.git

CSPACE-3765: Added a structured date group of fields to the Object Production Date field.  The existing repeatable scalar field, objectProductionDates, was retained for now, for backward compatibility.  All services tests pass; all but two App layer tests also pass, and those two failed tests both appear on their face to be unrelated - specific to a missing param in data used in posts of Media objects.
---

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 70f7d1531..1751e267b 100644
--- 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 @@
 
     <!-- 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">
         <xs:complexType>
             <xs:sequence>
@@ -223,6 +234,8 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <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"/>
@@ -532,6 +545,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"
diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index fd341593d..a66e79e9a 100644
--- 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"