CSPACE-4775: Changing four fields to be structured dates in CollectionObject.

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 6d407a15e25cb66dfdc535c743073a58d7137290..54a923e765b11509b18ae2d30591098d00322339 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
@@ -157,7 +157,7 @@
         <xs:sequence>\r
             <xs:element name="inscriptionContent" type="xs:string"/>\r
             <xs:element name="inscriptionContentInscriber" type="xs:string"/>\r
-            <xs:element name="inscriptionContentDate" type="xs:string"/>\r
+            <xs:element name="inscriptionContentDateGroup" type="structuredDateGroup"/>\r
             <xs:element name="inscriptionContentInterpretation" type="xs:string"/>\r
             <xs:element name="inscriptionContentLanguage" type="xs:string"/>\r
             <xs:element name="inscriptionContentMethod" type="xs:string"/>\r
@@ -184,7 +184,7 @@
         <xs:sequence>\r
             <xs:element name="inscriptionDescription" type="xs:string"/>\r
             <xs:element name="inscriptionDescriptionInscriber" type="xs:string"/>\r
-            <xs:element name="inscriptionDescriptionDate" type="xs:string"/>\r
+            <xs:element name="inscriptionDescriptionDateGroup" type="structuredDateGroup"/>\r
             <xs:element name="inscriptionDescriptionInterpretation" type="xs:string"/>\r
             <xs:element name="inscriptionDescriptionMethod" type="xs:string"/>\r
             <xs:element name="inscriptionDescriptionPosition" type="xs:string"/>\r
@@ -335,7 +335,7 @@
 \r
     <!--  Object Collection Information Group -->\r
 \r
-    <xs:element name="fieldCollectionDate" type="xs:string"/>\r
+    <xs:element name="fieldCollectionDateGroup" type="structuredDateGroup"/>\r
     <xs:element name="fieldCollectionMethods">\r
         <xs:complexType>\r
             <xs:sequence>\r
@@ -677,7 +677,11 @@
     </xs:complexType>\r
     <xs:complexType name="assocDateGroup">\r
         <xs:sequence>\r
-            <xs:element name="assocDate" type="xs:string"/>\r
+            <!-- CSPACE-4775: Renamed assocDate to assocStructuredDateGroup. This doesn't follow the convention where the -->\r
+            <!-- structured date field would normally be named assocDateGroup, because a complexType by that name already exists. -->\r
+            <!-- The app layer doesn't handle the duplicated name well, and it's more invasive to change the name of the complexType -->\r
+            <!-- than to use an unconventional name for the field, which we'd be renaming anyway. -->\r
+            <xs:element name="assocStructuredDateGroup" type="structuredDateGroup"/>\r
             <xs:element name="assocDateType" type="xs:string"/>\r
             <xs:element name="assocDateNote" type="xs:string"/>\r
         </xs:sequence>\r