CSPACE-2671: Multiple changes to CollectionSpace record schema in the services layer...

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 33dff6582b2ba09f5d42d5a27c5dbe80ce50c0db..c50ed9e5dfd3419ce2db3e0f071a493bd0eb273f 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
@@ -61,7 +61,8 @@
     <xs:element name="title" type="xs:string"/>\r
     <xs:element name="titleLanguage" type="xs:string"/>\r
     <xs:element name="titleTranslation" type="xs:string"/>\r
-    <!-- FIXME [1.0 alpha] Need to add titleTranslationLanguage field here -->\r
+    <!-- FIXME [1.0 alpha] Need to add titleTranslationLanguage field here. DONE -->\r
+    <xs:element name="titleTranslationLanguage" type="xs:string"/>\r
     <xs:element name="titleType" type="xs:string"/>\r
     <!-- FIXME End of Title repeatable group -->\r
 \r
@@ -154,8 +155,14 @@
         </xs:complexType>\r
     </xs:element>\r
 \r
-    <!-- FIXME [1.0 alpha] contentPosition field must be made repeatable. -->\r
-    <xs:element name="contentPosition" type="xs:string"/>\r
+    <!-- FIXME [1.0 alpha] contentPosition field must be made repeatable. DONE -->\r
+    <xs:element name="contentPositions">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="contentPosition" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
     \r
     <xs:element name="contentScripts">\r
         <xs:complexType>\r
@@ -166,7 +173,8 @@
     </xs:element>\r
     <xs:element name="copyNumber" type="xs:string"/>\r
     \r
-    <!-- FIXME [1.0 alpha] Need to add dimensionSummary field here -->\r
+    <!-- FIXME [1.0 alpha] Need to add dimensionSummary field here. DONE -->\r
+    <xs:element name="dimensionSummary" type="xs:string"/>\r
     <xs:element name="dimensions" type="ns:dimensionList"/>\r
 \r
     <!-- FIXME Remove these six elements when the App/UI layer is -->\r
@@ -255,8 +263,14 @@
 \r
     <!-- Object Production Information -->\r
 \r
-    <!-- FIXME [1.0 alpha] objectProductionDate field must be made repeatable -->\r
-    <xs:element name="objectProductionDate" type="xs:string"/>\r
+    <!-- FIXME [1.0 alpha] objectProductionDate field must be made repeatable. DONE -->\r
+    <xs:element name="objectProductionDates">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="objectProductionDate" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
 \r
     <xs:element name="objectProductionNote" type="xs:string"/>\r
 \r
@@ -280,8 +294,14 @@
     <xs:element name="objectProductionPlaceRole" type="xs:string"/>\r
     <!-- FIXME End of Object production place repeatable group -->\r
 \r
-    <!-- FIXME [1.0 alpha] objectProductionDate field must be made repeatable -->\r
-    <xs:element name="objectProductionReason" type="xs:string"/>\r
+    <!-- FIXME [1.0 alpha] objectProductionReason field must be made repeatable. DONE -->\r
+    <xs:element name="objectProductionReasons">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="objectProductionReason" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
 \r
     <!-- FIXME Start of Technique repeatable group -->\r
     <xs:element name="technique" type="xs:string"/>\r
@@ -299,8 +319,9 @@
     <xs:element name="assocActivityNote" type="xs:string"/>\r
     <!-- FIXME End of Associated activity repeatable group -->\r
 \r
-    <!-- FIXME [1.0 alpha] Need to add assocConceptNote field here. -->\r
     <!-- FIXME Convert to Associated concept repeatable group -->\r
+    <!-- FIXME [1.0 alpha] Need to add assocConceptNote field here. DONE -->\r
+    <xs:element name="assocConceptNote" type="xs:string"/>\r
     <xs:element name="assocConcepts">\r
         <xs:complexType>\r
             <xs:sequence>\r
@@ -310,10 +331,11 @@
         </xs:complexType>\r
     </xs:element>\r
 \r
-    <!-- FIXME [1.0 Alpha] Need to add assocCulturalContextNote field here. -->\r
     <!-- FIXME rename fields, if not over CSPACE-2501 length limit, -->\r
     <!-- to assocCulturalAffinities, assocCulturalAffinity -->\r
     <!-- FIXME Convert to Associated cultural contexts repeatable group -->\r
+    <!-- FIXME [1.0 Alpha] Need to add assocCulturalContextNote field here. DONE -->\r
+    <xs:element name="assocCulturalContextNote" type="xs:string"/>\r
     <xs:element name="assocCulturalContexts">\r
         <xs:complexType>\r
             <xs:sequence>\r
@@ -323,15 +345,17 @@
         </xs:complexType>\r
     </xs:element>\r
 \r
-    <!-- FIXME [1.0 alpha] Need to add assocDateNote field here. -->\r
     <!-- FIXME Convert to Associated date repeatable group -->\r
+    <!-- FIXME [1.0 alpha] Need to add assocDateNote field here. DONE -->\r
+    <xs:element name="assocDateNote" type="xs:string"/>\r
     <xs:element name="assocDate" type="xs:string"/>\r
         <!-- FIXME Need to move assocDateNote field here, after conversion. -->\r
 \r
     <!-- FIXME Start of Associated event repeatable group -->\r
     <xs:element name="assocEventName" type="xs:string"/>\r
     <xs:element name="assocEventNameType" type="xs:string"/>\r
-    <!-- FIXME [1.0 alpha] Need to add assocEventNote field here. -->\r
+    <!-- FIXME [1.0 alpha] Need to add assocEventNote field here. DONE -->\r
+    <xs:element name="assocEventNote" type="xs:string"/>\r
     <xs:element name="assocEventOrganizations">\r
         <xs:complexType>\r
             <xs:sequence>\r
@@ -364,11 +388,18 @@
 \r
     <!-- FIXME Start of Associated object repeatable group -->\r
     <xs:element name="assocObject" type="xs:string"/>\r
+    <!-- Note: the Cataloging Schema - Limited for Release 1.0 shows -->\r
+    <!-- an Associated object note field, but no Associated object -->\r
+    <!-- type field. This is currently believed to be a typo, as the -->\r
+    <!-- main Cataloging Schema page and the repeatability spreadsheets -->\r
+    <!-- all show this as Associated object type. -->\r
     <xs:element name="assocObjectType" type="xs:string"/>\r
+\r
     <!-- FIXME End of Associated object repeatable group -->\r
 \r
-    <!-- FIXME [1.0 alpha] Need to add assocOrganizationNote field here. -->\r
     <!-- FIXME Convert to Associated organizations repeatable group -->\r
+    <!-- FIXME [1.0 alpha] Need to add assocOrganizationNote field here. DONE -->\r
+    <xs:element name="assocOrganizationNote" type="xs:string"/>\r
     <xs:element name="assocOrganizations">\r
         <xs:complexType>\r
             <xs:sequence>\r
@@ -378,8 +409,9 @@
         </xs:complexType>\r
     </xs:element>\r
 \r
-    <!-- FIXME [1.0 alpha] Need to add assocPeopleNote field here. -->\r
     <!-- FIXME Convert to Associated people repeatable group -->\r
+    <!-- FIXME [1.0 alpha] Need to add assocPeopleNote field here. DONE -->\r
+    <xs:element name="assocPeopleNote" type="xs:string"/>\r
     <xs:element name="assocPeoples">\r
         <xs:complexType>\r
             <xs:sequence>\r
@@ -389,29 +421,32 @@
         </xs:complexType>\r
     </xs:element>\r
 \r
-    <!-- FIXME [1.0 alpha] Need to add assocPersonNote field here. -->\r
     <!-- FIXME Convert to Associated person repeatable group -->\r
+    <!-- FIXME [1.0 alpha] Need to add assocPersonNote field here. DONE -->\r
+    <xs:element name="assocPersonNote" type="xs:string"/>\r
     <xs:element name="assocPersons">\r
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element name="assocPerson" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <!-- FIXME Need to move assocPersonNote field here, after conversion. -->\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
-        <!-- FIXME Need to move assocPersonNote field here, after conversion. -->\r
 \r
+    <!-- FIXME Convert to Associated place repeatable group -->\r
+    <!-- FIXME [1.0 alpha] Need to add assocPlaceNote field here. DONE -->\r
+    <xs:element name="assocPlaceNote" type="xs:string"/>\r
     <xs:element name="assocPlaces">\r
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element name="assocPlace" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <!-- FIXME Need to move assocPlaceNote field here, after conversion. -->\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
 \r
-    <!-- FIXME [1.0 alpha] Remove the associationNote field. -->\r
-    <xs:element name="associationNote" type="xs:string"/>\r
-    <!-- FIXME [1.0 alpha] Remove the associationType field. -->\r
-    <xs:element name="associationType" type="xs:string"/>\r
+    <!-- FIXME [1.0 alpha] Remove the associationNote field. DONE -->\r
+    <!-- FIXME [1.0 alpha] Remove the associationType field. DONE -->\r
 \r
     <!-- Object History and Association Information - History -->\r
     <xs:element name="objectHistoryNote" type="xs:string"/>\r
@@ -447,23 +482,40 @@
     <!-- Object Owner's Contribution Information -->\r
     <xs:element name="ownersPersonalExperience" type="xs:string"/>\r
     <xs:element name="ownersPersonalResponse" type="xs:string"/>\r
-    <!-- FIXME [1.0 alpha] ownersReference field must be made repeatable. -->\r
-    <xs:element name="ownersReference" type="xs:string"/>\r
+    <!-- FIXME [1.0 alpha] ownersReference field must be made repeatable. DONE -->\r
+    <xs:element name="ownersReferences">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="ownersReference" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
     <xs:element name="ownersContributionNote" type="xs:string"/>\r
 \r
     <!-- Object Viewers Contribution Information -->\r
     <xs:element name="viewersRole" type="xs:string"/>\r
     <xs:element name="viewersPersonalExperience" type="xs:string"/>\r
     <xs:element name="viewersPersonalResponse" type="xs:string"/>\r
-    <!-- FIXME [1.0 alpha] viewersReference field must be made repeatable. -->\r
-    <xs:element name="viewersReference" type="xs:string"/>\r
+    <!-- FIXME [1.0 alpha] viewersReference field must be made repeatable. DONE -->\r
+    <xs:element name="viewersReferences">\r
+            <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="viewersReference" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
     <xs:element name="viewersContributionNote" type="xs:string"/>\r
 \r
     <!-- Reference Information -->\r
 \r
-    <!-- FIXME [1.0 alpha] reference field must be made repeatable. -->\r
-    <xs:element name="reference" type="xs:string"/>\r
-\r
+    <!-- FIXME [1.0 alpha] reference field must be made repeatable. DONE -->\r
+    <xs:element name="references">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="reference" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
     <xs:element name="catalogNumber" type="xs:string"/>\r
 \r
     <!--  Object Collection Information Group -->\r

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index 60ff83fb78194119decbb387d9dc71364b53b721..1be4712f545fe2e1a2c1f2f8f3ed68d06b036f7b 100644 (file)
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -54,6 +54,7 @@
                 <xs:element name="title" type="xs:string"/>
                 <xs:element name="titleLanguage" type="xs:string"/>
                 <xs:element name="titleTranslation" type="xs:string"/>
+                <xs:element name="titleTranslationLanguage" type="xs:string"/>
                 <xs:element name="titleType" type="xs:string"/>
                 <xs:element name="recordStatus" type="xs:string"/>
 
@@ -80,9 +81,10 @@
                 <xs:element name="contentPeoples" type="contentPeopleList"/>
                 <xs:element name="contentPersons" type="contentPersonList"/>
                 <xs:element name="contentPlaces" type="contentPlaceList"/>
-                <xs:element name="contentPosition" type="xs:string"/>
+                <xs:element name="contentPositions" type="contentPositionList"/>
                 <xs:element name="contentScripts" type="contentScriptList"/>
                 <xs:element name="copyNumber" type="xs:string"/>
+                <xs:element name="dimensionSummary" type="xs:string"/>
                 <xs:element name="dimensions" type="ns:dimensionList"/>
 
                 <!-- Remove these six elements when the App/UI layer is -->
@@ -139,7 +141,7 @@
                 <xs:element name="objectComponentInformation" type="xs:string"/>
 
                 <!-- Object Production Information -->
-                <xs:element name="objectProductionDate" type="xs:string"/>
+                <xs:element name="objectProductionDates" type="objectProductionDateList"/>
                 <xs:element name="objectProductionNote" type="xs:string"/>
                 <xs:element name="objectProductionOrganization" type="xs:string"/>
                 <xs:element name="objectProductionOrganizationRole" type="xs:string"/>
@@ -149,7 +151,7 @@
                 <xs:element name="objectProductionPersonRole" type="xs:string"/>
                 <xs:element name="objectProductionPlace" type="xs:string"/>
                 <xs:element name="objectProductionPlaceRole" type="xs:string"/>
-                <xs:element name="objectProductionReason" type="xs:string"/>
+                <xs:element name="objectProductionReasons" type="objectProductionReasonList"/>
                 <xs:element name="technique" type="xs:string"/>
                 <xs:element name="techniqueType" type="xs:string"/>
 
@@ -160,23 +162,29 @@
                 <!-- length limit that made this abbreviation necessary. -->
                 <xs:element name="assocActivity" type="xs:string"/>
                 <xs:element name="assocActivityNote" type="xs:string"/>
+                <xs:element name="assocConceptNote" type="xs:string"/>
                 <xs:element name="assocConcepts" type="assocConceptList"/>
+                <xs:element name="assocCulturalContextNote" type="xs:string"/>
                 <xs:element name="assocCulturalContexts" type="assocCulturalContextList"/>
+                <xs:element name="assocDateNote" type="xs:string"/>
                 <xs:element name="assocDate" type="xs:string"/>
                 <xs:element name="assocEventName" type="xs:string"/>
                 <xs:element name="assocEventNameType" type="xs:string"/>
+                <xs:element name="assocEventNote" type="xs:string"/>
                 <xs:element name="assocEventOrganizations" type="assocEventOrganizationList"/>
                 <xs:element name="assocEventPeoples" type="assocEventPeopleList"/>
                 <xs:element name="assocEventPersons" type="assocEventPersonList"/>
                 <xs:element name="assocEventPlaces" type="assocEventPlaceList"/>
                 <xs:element name="assocObject" type="xs:string"/>
                 <xs:element name="assocObjectType" type="xs:string"/>
+                <xs:element name="assocOrganizationNote" type="xs:string"/>
                 <xs:element name="assocOrganizations" type="assocOrganizationList"/>
+                <xs:element name="assocPeopleNote" type="xs:string"/>
                 <xs:element name="assocPeoples" type="assocPeopleList"/>
+                <xs:element name="assocPersonNote" type="xs:string"/>
                 <xs:element name="assocPersons" type="assocPersonList"/>
+                <xs:element name="assocPlaceNote" type="xs:string"/>
                 <xs:element name="assocPlaces" type="assocPlaceList"/>
-                <xs:element name="associationNote" type="xs:string"/>
-                <xs:element name="associationType" type="xs:string"/>
 
                 <!-- Object History and Association Information - History -->
                 <xs:element name="objectHistoryNote" type="xs:string"/>
@@ -195,18 +203,18 @@
                 <!-- Object Owner's Contribution Information -->
                 <xs:element name="ownersPersonalExperience" type="xs:string"/>
                 <xs:element name="ownersPersonalResponse" type="xs:string"/>
-                <xs:element name="ownersReference" type="xs:string"/>
+                <xs:element name="ownersReferences" type="ownersReferenceList"/>
                 <xs:element name="ownersContributionNote" type="xs:string"/>
 
                 <!-- Object Viewers Contribution Information -->
                 <xs:element name="viewersRole" type="xs:string"/>
                 <xs:element name="viewersPersonalExperience" type="xs:string"/>
                 <xs:element name="viewersPersonalResponse" type="xs:string"/>
-                <xs:element name="viewersReference" type="xs:string"/>
+                <xs:element name="viewersReferences" type="viewersReferenceList"/>
                 <xs:element name="viewersContributionNote" type="xs:string"/>
 
                 <!-- Reference Information -->
-                <xs:element name="reference" type="xs:string"/>
+                <xs:element name="references" type="referenceList"/>
                 <xs:element name="catalogNumber" type="xs:string"/>
 
                 <!--  Object Collection Information Group -->
@@ -333,6 +341,12 @@
         </xs:sequence>
     </xs:complexType>
 
+    <xs:complexType name="contentPositionList">
+        <xs:sequence>
+            <xs:element name="contentPosition" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
     <xs:complexType name="contentScriptList">
         <xs:sequence>
             <xs:element name="contentScript" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
@@ -369,6 +383,18 @@
         </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="objectProductionReasonList">
+        <xs:sequence>
+            <xs:element name="objectProductionReason" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
     <xs:complexType name="assocConceptList">
         <xs:sequence>
             <xs:element name="assocConcept" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
@@ -435,6 +461,24 @@
         </xs:sequence>
     </xs:complexType>
 
+    <xs:complexType name="ownersReferenceList">
+        <xs:sequence>
+            <xs:element name="ownersReference" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="viewersReferenceList">
+        <xs:sequence>
+            <xs:element name="viewersReference" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="referenceList">
+        <xs:sequence>
+            <xs:element name="reference" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
     <xs:complexType name="fieldCollectionMethodList">
         <xs:sequence>
             <xs:element name="fieldCollectionMethod" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>