CSPACE-3937,CSPACE-4490: In services Cataloging / CollectionObject schema, converted...

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 64bfc66a032e453db9eacb78ae2cd02355a1fcbe..c87092a534b6955b38d982a9b5afa94242264eab 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
@@ -83,12 +83,7 @@
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
-    <!-- Note: Penelope's repeatability spreadsheet identifies a Content Date -->\r
-    <!-- repeatable group, containing contentDate and dateAssociation fields. -->\r
-    <!-- Did not find the dateAssociation field in the wiki schemas, however.  -->\r
-    <!-- contentDate is itself a structured date field, containing a dateAssociation -->\r
-    <!-- field, so perhaps this may merely be a product of some confusion. -->\r
-    <xs:element name="contentDate" type="xs:string"/>\r
+    <xs:element name="contentDateGroup" type="structuredDateGroup"/>\r
     <xs:element name="contentDescription" type="xs:string"/>\r
     <xs:element name="contentEventNameGroupList" type="contentEventNameGroupList"/>\r
     <xs:element name="contentNote" type="xs:string"/>\r
@@ -204,9 +199,7 @@
     <xs:element name="objectComponentGroupList" type="objectComponentGroupList"/>\r
 \r
     <!-- Object Production Information -->\r
-\r
-    <xs:element name="objectProductionDateGroup" type="objectProductionDateGroup"/>\r
-\r
+    <xs:element name="objectProductionDateGroupList" type="objectProductionDateGroupList"/>\r
     <xs:element name="objectProductionNote" type="xs:string"/>\r
     <xs:element name="objectProductionOrganizationGroupList" type="objectProductionOrganizationGroupList"/>\r
     <xs:element name="objectProductionPeopleGroupList" type="objectProductionPeopleGroupList"/>\r
@@ -317,7 +310,7 @@
     <xs:element name="viewersPersonalExperience" type="xs:string"/>\r
     <xs:element name="viewersPersonalResponse" type="xs:string"/>\r
     <xs:element name="viewersReferences">\r
-            <xs:complexType>\r
+        <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element name="viewersReference" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
             </xs:sequence>\r
@@ -385,13 +378,13 @@
     </xs:complexType>\r
     <xs:complexType name="objectNameGroup">\r
         <xs:sequence>\r
-                <xs:element name="objectName" type="xs:string"/>\r
-                <xs:element name="objectNameCurrency" type="xs:string"/>\r
-                <xs:element name="objectNameLevel" type="xs:string"/>\r
-                <xs:element name="objectNameNote" type="xs:string"/>\r
-                <xs:element name="objectNameSystem" type="xs:string"/>\r
-                <xs:element name="objectNameType" type="xs:string"/>\r
-                <xs:element name="objectNameLanguage" type="xs:string"/>\r
+            <xs:element name="objectName" type="xs:string"/>\r
+            <xs:element name="objectNameCurrency" type="xs:string"/>\r
+            <xs:element name="objectNameLevel" type="xs:string"/>\r
+            <xs:element name="objectNameNote" type="xs:string"/>\r
+            <xs:element name="objectNameSystem" type="xs:string"/>\r
+            <xs:element name="objectNameType" type="xs:string"/>\r
+            <xs:element name="objectNameLanguage" type="xs:string"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
 \r
@@ -423,7 +416,7 @@
             <xs:element name="titleTranslation" type="xs:string"/>\r
             <xs:element name="titleTranslationLanguage" type="xs:string"/>\r
         </xs:sequence>\r
-     </xs:complexType>\r
+    </xs:complexType>\r
 \r
     <xs:complexType name="contentEventNameGroupList">\r
         <xs:sequence>\r
@@ -448,7 +441,7 @@
         <xs:sequence>\r
             <xs:element name="contentObject" type="xs:string"/>\r
             <xs:element name="contentObjectType" type="xs:string"/>\r
-         </xs:sequence>\r
+        </xs:sequence>\r
     </xs:complexType>\r
 \r
     <xs:complexType name="contentOtherGroupList">\r
@@ -513,11 +506,11 @@
         </xs:sequence>\r
     </xs:complexType>\r
     \r
-       <xs:complexType name="objectStatusList">\r
-               <xs:sequence>\r
-                       <xs:element name="objectStatus" type="xs:string" minOccurs="0" maxOccurs="unbounded" />\r
-               </xs:sequence>\r
-       </xs:complexType>\r
+    <xs:complexType name="objectStatusList">\r
+        <xs:sequence>\r
+            <xs:element name="objectStatus" type="xs:string" minOccurs="0" maxOccurs="unbounded" />\r
+        </xs:sequence>\r
+    </xs:complexType>\r
 \r
     <xs:complexType name="technicalAttributeGroupList">\r
         <xs:sequence>\r
@@ -546,31 +539,10 @@
         </xs:sequence>\r
     </xs:complexType>\r
 \r
-    <xs:complexType name="objectProductionDateGroup">\r
+    <xs:complexType name="objectProductionDateGroupList">\r
         <xs:sequence>\r
-            <xs:element name="dateDisplayDate" type="xs:string"/>\r
-            <xs:element name="dateAssociation" type="xs:string"/>\r
-            <xs:element name="dateEarliestSingleYear" type="xs:integer"/>\r
-            <xs:element name="dateEarliestSingleMonth" type="xs:integer"/>\r
-            <xs:element name="dateEarliestSingleDay" type="xs:integer"/>\r
-            <xs:element name="dateEarliestSingleEra" 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:integer"/>\r
-            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>\r
-            <xs:element name="dateLatestYear" type="xs:integer"/>\r
-            <xs:element name="dateLatestMonth" type="xs:integer"/>\r
-            <xs:element name="dateLatestDay" type="xs:integer"/>\r
-            <xs:element name="dateLatestEra" 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:integer"/>\r
-            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>\r
-            <xs:element name="datePeriod" type="xs:string"/>\r
-            <xs:element name="dateNote" type="xs:string"/>\r
-            <xs:element name="dateEarliestScalarValue" type="xs:date"/>\r
-            <xs:element name="dateLatestScalarValue" type="xs:date"/>\r
-            <xs:element name="scalarValuesComputed" type="xs:boolean"/>\r
+            <xs:element name="objectProductionDateGroup" type="structuredDateGroup" minOccurs="0"\r
+                maxOccurs="unbounded"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
 \r
@@ -710,7 +682,7 @@
             <xs:element name="assocObject" type="xs:string"/>\r
             <xs:element name="assocObjectType" type="xs:string"/>\r
             <xs:element name="assocObjectNote" type="xs:string"/>\r
-         </xs:sequence>\r
+        </xs:sequence>\r
     </xs:complexType>\r
 \r
     <xs:complexType name="assocOrganizationGroupList">\r
@@ -782,29 +754,48 @@
         </xs:sequence>\r
     </xs:complexType>\r
     \r
-       <xs:complexType name="referenceGroupList">\r
-               <xs:sequence>\r
-                       <xs:element name="referenceGroup" type="referenceGroup" minOccurs="0" maxOccurs="unbounded"/>\r
-               </xs:sequence>\r
-       </xs:complexType>\r
+    <xs:complexType name="referenceGroupList">\r
+        <xs:sequence>\r
+            <xs:element name="referenceGroup" type="referenceGroup" minOccurs="0" maxOccurs="unbounded"/>\r
+        </xs:sequence>\r
+    </xs:complexType>\r
         \r
-       <xs:complexType name="referenceGroup">\r
-               <xs:sequence>\r
-                       <xs:element name="reference" type="xs:string"/>\r
-                       <xs:element name="referenceNote" type="xs:string"/>\r
-               </xs:sequence>\r
-       </xs:complexType>\r
-    \r
-    <!-- Object Description Date Information -->\r
-    <!-- This appears to be a placeholder structured date -->\r
-    <xs:element name="dateAssociation" type="xs:string"/>\r
-    <xs:element name="dateEarliestSingle" type="xs:string"/>\r
-    <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>\r
-    <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>\r
-    <xs:element name="dateLatest" type="xs:string"/>\r
-    <xs:element name="dateLatestCertainty" type="xs:string"/>\r
-    <xs:element name="dateLatestQualifier" type="xs:string"/>\r
-    <xs:element name="datePeriod" type="xs:string"/>\r
-    <xs:element name="dateText" type="xs:string"/>\r
+    <xs:complexType name="referenceGroup">\r
+        <xs:sequence>\r
+            <xs:element name="reference" type="xs:string"/>\r
+            <xs:element name="referenceNote" type="xs:string"/>\r
+        </xs:sequence>\r
+    </xs:complexType>\r
+\r
+    <!-- Before (re)using this generic complex type in any record type -->\r
+    <!-- other than CollectionObject, be sure to verify that Nuxeo handles -->\r
+    <!-- that correctly in its table creation/row linking. -->\r
+    <xs:complexType name="structuredDateGroup">\r
+        <xs:sequence>\r
+            <xs:element name="dateDisplayDate" type="xs:string"/>\r
+            <xs:element name="dateAssociation" type="xs:string"/>\r
+            <xs:element name="dateEarliestSingleYear" type="xs:integer"/>\r
+            <xs:element name="dateEarliestSingleMonth" type="xs:integer"/>\r
+            <xs:element name="dateEarliestSingleDay" type="xs:integer"/>\r
+            <xs:element name="dateEarliestSingleEra" 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:integer"/>\r
+            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>\r
+            <xs:element name="dateLatestYear" type="xs:integer"/>\r
+            <xs:element name="dateLatestMonth" type="xs:integer"/>\r
+            <xs:element name="dateLatestDay" type="xs:integer"/>\r
+            <xs:element name="dateLatestEra" 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:integer"/>\r
+            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>\r
+            <xs:element name="datePeriod" type="xs:string"/>\r
+            <xs:element name="dateNote" type="xs:string"/>\r
+            <xs:element name="dateEarliestScalarValue" type="xs:date"/>\r
+            <xs:element name="dateLatestScalarValue" type="xs:date"/>\r
+            <xs:element name="scalarValuesComputed" type="xs:boolean"/>\r
+        </xs:sequence>\r
+    </xs:complexType>\r
 \r
 </xs:schema>\r

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index b47e00890dda071b82b6138d06df2cba1c9a5703..08d00c9fb5c979644e882e7c7169d2edebab569e 100644 (file)
--- 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 49c21c9621871aa7b62c3df042d099740cf1f63d..6022796c6d9ed417a1ebe57bd364f9dd02ec896d 100755 (executable)
--- 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>\r
             </collectionobjects_common:contentPlaces>\r
             <collectionobjects_common:dateEarliestSingleCertainty/>\r
-            <collectionobjects_common:objectProductionDates/>\r
+            <collectionobjects_common:objectProductionDateGroupList/>\r
             <collectionobjects_common:contentConcepts>\r
               <contentConcept></contentConcept>\r
             </collectionobjects_common:contentConcepts>\r
@@ -98,7 +98,7 @@
                 <objectProductionPlaceRole></objectProductionPlaceRole>\r
               </objectProductionPlaceGroup>\r
             </collectionobjects_common:objectProductionPlaceGroupList>\r
-            <collectionobjects_common:contentDate></collectionobjects_common:contentDate>\r
+            <collectionobjects_common:contentDateGroup/>\r
             <collectionobjects_common:assocPlaceGroupList/>\r
             <collectionobjects_common:physicalDescription>It's pretty big - the size of an ogre.. Three arms and a hump-back</collectionobjects_common:physicalDescription>\r
             <collectionobjects_common:dimensionValue/>\r
@@ -271,4 +271,4 @@
             </collectionobjects_common:responsibleDepartments>\r
        </schema>\r
   </import>\r
-</imports>
\ No newline at end of file
+</imports>\r