From 8fc285409d5b95a83f7acb9ba831763c88b5844d Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Sat, 19 Nov 2011 00:05:18 +0000
Subject: [PATCH] CSPACE-3937,CSPACE-4490: In services Cataloging /
 CollectionObject schema, converted contentDate to a structured date; was
 formerly a scalar date field. Made the existing objectProductionDateGroup
 structured date field repeatable, renaming the parent element to
 objectProductionDateGroupList. Removed a legacy top-level set of scalar
 fields, believed to be unused, that appear to constitute an early prototype
 or placeholder for structured date.

---
 .../schemas/collectionobjects_common.xsd      | 135 ++++++++----------
 .../resources/collectionobjects_common.xsd    | 123 ++++++++--------
 .../requests/collectionobject-request.xml     |   6 +-
 3 files changed, 127 insertions(+), 137 deletions(-)

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 64bfc66a0..c87092a53 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
@@ -83,12 +83,7 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    <!-- Note: Penelope's repeatability spreadsheet identifies a Content Date -->
-    <!-- repeatable group, containing contentDate and dateAssociation fields. -->
-    <!-- Did not find the dateAssociation field in the wiki schemas, however.  -->
-    <!-- contentDate is itself a structured date field, containing a dateAssociation -->
-    <!-- field, so perhaps this may merely be a product of some confusion. -->
-    <xs:element name="contentDate" type="xs:string"/>
+    <xs:element name="contentDateGroup" type="structuredDateGroup"/>
     <xs:element name="contentDescription" type="xs:string"/>
     <xs:element name="contentEventNameGroupList" type="contentEventNameGroupList"/>
     <xs:element name="contentNote" type="xs:string"/>
@@ -204,9 +199,7 @@
     <xs:element name="objectComponentGroupList" type="objectComponentGroupList"/>
 
     <!-- Object Production Information -->
-
-    <xs:element name="objectProductionDateGroup" type="objectProductionDateGroup"/>
-
+    <xs:element name="objectProductionDateGroupList" type="objectProductionDateGroupList"/>
     <xs:element name="objectProductionNote" type="xs:string"/>
     <xs:element name="objectProductionOrganizationGroupList" type="objectProductionOrganizationGroupList"/>
     <xs:element name="objectProductionPeopleGroupList" type="objectProductionPeopleGroupList"/>
@@ -317,7 +310,7 @@
     <xs:element name="viewersPersonalExperience" type="xs:string"/>
     <xs:element name="viewersPersonalResponse" type="xs:string"/>
     <xs:element name="viewersReferences">
-            <xs:complexType>
+        <xs:complexType>
             <xs:sequence>
                 <xs:element name="viewersReference" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
             </xs:sequence>
@@ -385,13 +378,13 @@
     </xs:complexType>
     <xs:complexType name="objectNameGroup">
         <xs:sequence>
-                <xs:element name="objectName" type="xs:string"/>
-                <xs:element name="objectNameCurrency" type="xs:string"/>
-                <xs:element name="objectNameLevel" type="xs:string"/>
-                <xs:element name="objectNameNote" type="xs:string"/>
-                <xs:element name="objectNameSystem" type="xs:string"/>
-                <xs:element name="objectNameType" type="xs:string"/>
-                <xs:element name="objectNameLanguage" type="xs:string"/>
+            <xs:element name="objectName" type="xs:string"/>
+            <xs:element name="objectNameCurrency" type="xs:string"/>
+            <xs:element name="objectNameLevel" type="xs:string"/>
+            <xs:element name="objectNameNote" type="xs:string"/>
+            <xs:element name="objectNameSystem" type="xs:string"/>
+            <xs:element name="objectNameType" type="xs:string"/>
+            <xs:element name="objectNameLanguage" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>
 
@@ -423,7 +416,7 @@
             <xs:element name="titleTranslation" type="xs:string"/>
             <xs:element name="titleTranslationLanguage" type="xs:string"/>
         </xs:sequence>
-     </xs:complexType>
+    </xs:complexType>
 
     <xs:complexType name="contentEventNameGroupList">
         <xs:sequence>
@@ -448,7 +441,7 @@
         <xs:sequence>
             <xs:element name="contentObject" type="xs:string"/>
             <xs:element name="contentObjectType" type="xs:string"/>
-         </xs:sequence>
+        </xs:sequence>
     </xs:complexType>
 
     <xs:complexType name="contentOtherGroupList">
@@ -513,11 +506,11 @@
         </xs:sequence>
     </xs:complexType>
     
-	<xs:complexType name="objectStatusList">
-		<xs:sequence>
-			<xs:element name="objectStatus" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="objectStatusList">
+        <xs:sequence>
+            <xs:element name="objectStatus" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+    </xs:complexType>
 
     <xs:complexType name="technicalAttributeGroupList">
         <xs:sequence>
@@ -546,31 +539,10 @@
         </xs:sequence>
     </xs:complexType>
 
-    <xs:complexType name="objectProductionDateGroup">
+    <xs:complexType name="objectProductionDateGroupList">
         <xs:sequence>
-            <xs:element name="dateDisplayDate" type="xs:string"/>
-            <xs:element name="dateAssociation" type="xs:string"/>
-            <xs:element name="dateEarliestSingleYear" type="xs:integer"/>
-            <xs:element name="dateEarliestSingleMonth" type="xs:integer"/>
-            <xs:element name="dateEarliestSingleDay" type="xs:integer"/>
-            <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:integer"/>
-            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>
-            <xs:element name="dateLatestYear" type="xs:integer"/>
-            <xs:element name="dateLatestMonth" type="xs:integer"/>
-            <xs:element name="dateLatestDay" type="xs:integer"/>
-            <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:integer"/>
-            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>
-            <xs:element name="datePeriod" type="xs:string"/>
-            <xs:element name="dateNote" type="xs:string"/>
-            <xs:element name="dateEarliestScalarValue" type="xs:date"/>
-            <xs:element name="dateLatestScalarValue" type="xs:date"/>
-            <xs:element name="scalarValuesComputed" type="xs:boolean"/>
+            <xs:element name="objectProductionDateGroup" type="structuredDateGroup" minOccurs="0"
+                maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 
@@ -710,7 +682,7 @@
             <xs:element name="assocObject" type="xs:string"/>
             <xs:element name="assocObjectType" type="xs:string"/>
             <xs:element name="assocObjectNote" type="xs:string"/>
-         </xs:sequence>
+        </xs:sequence>
     </xs:complexType>
 
     <xs:complexType name="assocOrganizationGroupList">
@@ -782,29 +754,48 @@
         </xs:sequence>
     </xs:complexType>
     
-	<xs:complexType name="referenceGroupList">
-		<xs:sequence>
-			<xs:element name="referenceGroup" type="referenceGroup" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="referenceGroupList">
+        <xs:sequence>
+            <xs:element name="referenceGroup" type="referenceGroup" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
 	 
-	<xs:complexType name="referenceGroup">
-		<xs:sequence>
-			<xs:element name="reference" type="xs:string"/>
-			<xs:element name="referenceNote" type="xs:string"/>
-		</xs:sequence>
-	</xs:complexType>
-    
-    <!-- Object Description Date Information -->
-    <!-- This appears to be a placeholder structured date -->
-    <xs:element name="dateAssociation" type="xs:string"/>
-    <xs:element name="dateEarliestSingle" type="xs:string"/>
-    <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>
-    <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>
-    <xs:element name="dateLatest" type="xs:string"/>
-    <xs:element name="dateLatestCertainty" type="xs:string"/>
-    <xs:element name="dateLatestQualifier" type="xs:string"/>
-    <xs:element name="datePeriod" type="xs:string"/>
-    <xs:element name="dateText" type="xs:string"/>
+    <xs:complexType name="referenceGroup">
+        <xs:sequence>
+            <xs:element name="reference" type="xs:string"/>
+            <xs:element name="referenceNote" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <!-- Before (re)using this generic complex type in any record type -->
+    <!-- other than CollectionObject, be sure to verify that Nuxeo handles -->
+    <!-- that correctly in its table creation/row linking. -->
+    <xs:complexType name="structuredDateGroup">
+        <xs:sequence>
+            <xs:element name="dateDisplayDate" type="xs:string"/>
+            <xs:element name="dateAssociation" type="xs:string"/>
+            <xs:element name="dateEarliestSingleYear" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleMonth" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleDay" type="xs:integer"/>
+            <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:integer"/>
+            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>
+            <xs:element name="dateLatestYear" type="xs:integer"/>
+            <xs:element name="dateLatestMonth" type="xs:integer"/>
+            <xs:element name="dateLatestDay" type="xs:integer"/>
+            <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:integer"/>
+            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>
+            <xs:element name="datePeriod" type="xs:string"/>
+            <xs:element name="dateNote" type="xs:string"/>
+            <xs:element name="dateEarliestScalarValue" type="xs:date"/>
+            <xs:element name="dateLatestScalarValue" type="xs:date"/>
+            <xs:element name="scalarValuesComputed" type="xs:boolean"/>
+        </xs:sequence>
+    </xs:complexType>
 
 </xs:schema>
diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index b47e00890..08d00c9fb 100644
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -63,7 +63,7 @@
                 <!-- Object Description - Content Information -->
                 <xs:element name="contentActivities" type="contentActivityList"/>
                 <xs:element name="contentConcepts" type="contentConceptList"/>
-                <xs:element name="contentDate" type="xs:string"/>
+                <xs:element name="contentDateGroup" type="structuredDateGroup"/>
                 <xs:element name="contentDescription" type="xs:string"/>
                 <xs:element name="contentEventNameGroupList" type="contentEventNameGroupList"/>
                 <xs:element name="contentNote" type="xs:string"/>
@@ -123,9 +123,7 @@
                 <xs:element name="objectComponentGroupList" type="objectComponentGroupList"/>
 
                 <!-- Object Production Information -->
-
-                <xs:element name="objectProductionDateGroup" type="objectProductionDateGroup"/>
-
+                <xs:element name="objectProductionDateGroupList" type="objectProductionDateGroupList"/>
                 <xs:element name="objectProductionNote" type="xs:string"/>
                 <xs:element name="objectProductionOrganizationGroupList" type="objectProductionOrganizationGroupList"/>
                 <xs:element name="objectProductionPeopleGroupList" type="objectProductionPeopleGroupList"/>
@@ -222,13 +220,13 @@
     </xs:complexType>
     <xs:complexType name="objectNameGroup">
         <xs:sequence>
-                <xs:element name="objectName" type="xs:string"/>
-                <xs:element name="objectNameCurrency" type="xs:string"/>
-                <xs:element name="objectNameLevel" type="xs:string"/>
-                <xs:element name="objectNameNote" type="xs:string"/>
-                <xs:element name="objectNameSystem" type="xs:string"/>
-                <xs:element name="objectNameType" type="xs:string"/>
-                <xs:element name="objectNameLanguage" type="xs:string"/>
+            <xs:element name="objectName" type="xs:string"/>
+            <xs:element name="objectNameCurrency" type="xs:string"/>
+            <xs:element name="objectNameLevel" type="xs:string"/>
+            <xs:element name="objectNameNote" type="xs:string"/>
+            <xs:element name="objectNameSystem" type="xs:string"/>
+            <xs:element name="objectNameType" type="xs:string"/>
+            <xs:element name="objectNameLanguage" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>
 
@@ -260,9 +258,9 @@
             <xs:element name="titleTranslation" type="xs:string"/>
             <xs:element name="titleTranslationLanguage" type="xs:string"/>
         </xs:sequence>
-     </xs:complexType>
+    </xs:complexType>
 
-        <xs:complexType name="contentEventNameGroupList">
+    <xs:complexType name="contentEventNameGroupList">
         <xs:sequence>
             <xs:element name="contentEventNameGroup" type="contentEventNameGroup" minOccurs="0"
                 maxOccurs="unbounded"/>
@@ -285,7 +283,7 @@
         <xs:sequence>
             <xs:element name="contentObject" type="xs:string"/>
             <xs:element name="contentObjectType" type="xs:string"/>
-         </xs:sequence>
+        </xs:sequence>
     </xs:complexType>
     
     <xs:complexType name="contentOtherGroupList">
@@ -434,11 +432,11 @@
         </xs:sequence>
     </xs:complexType>
     
-	<xs:complexType name="objectStatusList">
-		<xs:sequence>
-			<xs:element name="objectStatus" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="objectStatusList">
+        <xs:sequence>
+            <xs:element name="objectStatus" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+    </xs:complexType>
 
     <xs:complexType name="styleList">
         <xs:sequence>
@@ -473,37 +471,10 @@
         </xs:sequence>
     </xs:complexType>
 
-    <xs:complexType name="objectProductionDateList">
-        <xs:sequence>
-            <xs:element name="objectProductionDate" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="objectProductionDateGroup">
+    <xs:complexType name="objectProductionDateGroupList">
         <xs:sequence>
-            <xs:element name="dateDisplayDate" type="xs:string"/>
-            <xs:element name="dateAssociation" type="xs:string"/>
-            <xs:element name="dateEarliestSingleYear" type="xs:integer"/>
-            <xs:element name="dateEarliestSingleMonth" type="xs:integer"/>
-            <xs:element name="dateEarliestSingleDay" type="xs:integer"/>
-            <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:integer"/>
-            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>
-            <xs:element name="dateLatestYear" type="xs:integer"/>
-            <xs:element name="dateLatestMonth" type="xs:integer"/>
-            <xs:element name="dateLatestDay" type="xs:integer"/>
-            <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:integer"/>
-            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>
-            <xs:element name="datePeriod" type="xs:string"/>
-            <xs:element name="dateNote" type="xs:string"/>
-            <xs:element name="dateEarliestScalarValue" type="xs:date"/>
-            <xs:element name="dateLatestScalarValue" type="xs:date"/>
-            <xs:element name="scalarValuesComputed" type="xs:boolean"/>
+            <xs:element name="objectProductionDateGroup" type="structuredDateGroup" minOccurs="0"
+                maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 
@@ -546,7 +517,7 @@
         </xs:sequence>
     </xs:complexType>
 
-         <xs:complexType name="objectProductionPlaceGroupList">
+    <xs:complexType name="objectProductionPlaceGroupList">
         <xs:sequence>
             <xs:element name="objectProductionPlaceGroup" type="objectProductionPlaceGroup" minOccurs="0"
                 maxOccurs="unbounded"/>
@@ -673,7 +644,7 @@
             <xs:element name="assocObject" type="xs:string"/>
             <xs:element name="assocObjectType" type="xs:string"/>
             <xs:element name="assocObjectNote" type="xs:string"/>
-         </xs:sequence>
+        </xs:sequence>
     </xs:complexType>
 
     <xs:complexType name="assocOrganizationGroupList">
@@ -763,18 +734,18 @@
         </xs:sequence>
     </xs:complexType>
 
-	<xs:complexType name="referenceGroupList">
-		<xs:sequence>
-			<xs:element name="referenceGroup" type="referenceGroup" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="referenceGroupList">
+        <xs:sequence>
+            <xs:element name="referenceGroup" type="referenceGroup" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
 	 
-	<xs:complexType name="referenceGroup">
-		<xs:sequence>
-			<xs:element name="reference" type="xs:string"/>
-			<xs:element name="referenceNote" type="xs:string"/>
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="referenceGroup">
+        <xs:sequence>
+            <xs:element name="reference" type="xs:string"/>
+            <xs:element name="referenceNote" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
 
     <xs:complexType name="fieldCollectionMethodList">
         <xs:sequence>
@@ -799,6 +770,34 @@
             <xs:element name="fieldColEventName" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
+    
+    <xs:complexType name="structuredDateGroup">
+        <xs:sequence>
+            <xs:element name="dateDisplayDate" type="xs:string"/>
+            <xs:element name="dateAssociation" type="xs:string"/>
+            <xs:element name="dateEarliestSingleYear" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleMonth" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleDay" type="xs:integer"/>
+            <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:integer"/>
+            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>
+            <xs:element name="dateLatestYear" type="xs:integer"/>
+            <xs:element name="dateLatestMonth" type="xs:integer"/>
+            <xs:element name="dateLatestDay" type="xs:integer"/>
+            <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:integer"/>
+            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>
+            <xs:element name="datePeriod" type="xs:string"/>
+            <xs:element name="dateNote" type="xs:string"/>
+            <xs:element name="dateEarliestScalarValue" type="xs:date"/>
+            <xs:element name="dateLatestScalarValue" type="xs:date"/>
+            <xs:element name="scalarValuesComputed" type="xs:boolean"/>
+        </xs:sequence>
+    </xs:complexType>
         
 </xs:schema>
 
diff --git a/services/imports/service/src/test/resources/requests/collectionobject-request.xml b/services/imports/service/src/test/resources/requests/collectionobject-request.xml
index 49c21c962..6022796c6 100755
--- a/services/imports/service/src/test/resources/requests/collectionobject-request.xml
+++ b/services/imports/service/src/test/resources/requests/collectionobject-request.xml
@@ -54,7 +54,7 @@
               <contentPlace></contentPlace>
             </collectionobjects_common:contentPlaces>
             <collectionobjects_common:dateEarliestSingleCertainty/>
-            <collectionobjects_common:objectProductionDates/>
+            <collectionobjects_common:objectProductionDateGroupList/>
             <collectionobjects_common:contentConcepts>
               <contentConcept></contentConcept>
             </collectionobjects_common:contentConcepts>
@@ -98,7 +98,7 @@
                 <objectProductionPlaceRole></objectProductionPlaceRole>
               </objectProductionPlaceGroup>
             </collectionobjects_common:objectProductionPlaceGroupList>
-            <collectionobjects_common:contentDate></collectionobjects_common:contentDate>
+            <collectionobjects_common:contentDateGroup/>
             <collectionobjects_common:assocPlaceGroupList/>
             <collectionobjects_common:physicalDescription>It's pretty big - the size of an ogre.. Three arms and a hump-back</collectionobjects_common:physicalDescription>
             <collectionobjects_common:dimensionValue/>
@@ -271,4 +271,4 @@
             </collectionobjects_common:responsibleDepartments>
        </schema>
   </import>
-</imports>
\ No newline at end of file
+</imports>
-- 
2.47.3