From 167dd0bf6ba1890685168c39e46385da38af8ad5 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 5 May 2011 02:04:55 +0000
Subject: [PATCH] CSPACE-3756,CSPACE-3875: Revised CollectionObject /
 Cataloging schema in the services to update the Object Poduction Date
 structured date field, to conform to the latest wiki schema for the
 structured date type (Date Schema - Proposed Revisions).

---
 .../schemas/collectionobjects_common.xsd      | 25 ++++++++++-------
 .../resources/collectionobjects_common.xsd    | 27 ++++++++++++-------
 2 files changed, 34 insertions(+), 18 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 1751e267b..fcc08c8bd 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
@@ -547,17 +547,24 @@
 
     <xs:complexType name="objectProductionDateGroup">
         <xs:sequence>
-            <xs:element name="dateText" type="xs:string"/>
+            <xs:element name="displayDate" type="xs:string"/>
             <xs:element name="dateAssociation" type="xs:string"/>
+            <xs:element name="dateEarliestSingleYear" type="xs:string"/>
+            <xs:element name="dateEarliestSingleMonth" type="xs:string"/>
+            <xs:element name="dateEarliestSingleDay" type="xs:string"/>
+            <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>
+            <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>
+            <xs:element name="dateEarliestSingleQualifierValue" type="xs:string"/>
+            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>
+            <xs:element name="dateLatestYear" type="xs:string"/>
+            <xs:element name="dateLatestMonth" type="xs:string"/>
+            <xs:element name="dateLatestDay" type="xs:string"/>
+            <xs:element name="dateLatestCertainty" type="xs:string"/>
+            <xs:element name="dateLatestQualifier" type="xs:string"/>
+            <xs:element name="dateLatestQualifierValue" type="xs:string"/>
+            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>
             <xs:element name="datePeriod" type="xs:string"/>
-            <xs:element name="dateSingleOrRangeStart" type="xs:string"/>
-            <xs:element name="dateSingleOrRangeStartCertainty" type="xs:string"/>
-            <xs:element name="dateSingleOrRangeStartQualifier" type="xs:string"/>
-            <xs:element name="dateSingleOrRangeStartQualifierValue" type="xs:string"/>
-            <xs:element name="dateRangeEnd" type="xs:string"/>
-            <xs:element name="dateRangeEndCertainty" type="xs:string"/>
-            <xs:element name="dateRangeEndQualifier" type="xs:string"/>
-            <xs:element name="dateRangeEndQualifierValue" type="xs:string"/>
+            <xs:element name="dateNote" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>
 
diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index a66e79e9a..960aea231 100644
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -485,17 +485,26 @@
 
     <xs:complexType name="objectProductionDateGroup">
         <xs:sequence>
-            <xs:element name="dateText" type="xs:string"/>
+            <xs:element name="displayDate" type="xs:string"/>
             <xs:element name="dateAssociation" type="xs:string"/>
+            <xs:element name="dateEarliestSingleYear" type="xs:string"/>
+            <xs:element name="dateEarliestSingleMonth" type="xs:string"/>
+            <xs:element name="dateEarliestSingleDay" type="xs:string"/>
+            <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:string"/>
+            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>
+            <xs:element name="dateLatestYear" type="xs:string"/>
+            <xs:element name="dateLatestMonth" type="xs:string"/>
+            <xs:element name="dateLatestDay" type="xs:string"/>
+            <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:string"/>
+            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>
             <xs:element name="datePeriod" type="xs:string"/>
-            <xs:element name="dateSingleOrRangeStart" type="xs:string"/>
-            <xs:element name="dateSingleOrRangeStartCertainty" type="xs:string"/>
-            <xs:element name="dateSingleOrRangeStartQualifier" type="xs:string"/>
-            <xs:element name="dateSingleOrRangeStartQualifierValue" type="xs:string"/>
-            <xs:element name="dateRangeEnd" type="xs:string"/>
-            <xs:element name="dateRangeEndCertainty" type="xs:string"/>
-            <xs:element name="dateRangeEndQualifier" type="xs:string"/>
-            <xs:element name="dateRangeEndQualifierValue" type="xs:string"/>
+            <xs:element name="dateNote" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>
 
-- 
2.47.3