From 3ea8d08c2ecb331953b3e6b31d15d377853f8bfb Mon Sep 17 00:00:00 2001
From: Ray Lee <rhlee@berkeley.edu>
Date: Tue, 28 Feb 2012 12:54:43 -0800
Subject: [PATCH] CSPACE-4775: Changing four fields to be structured dates in
 CollectionObject.

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