CSPACE-3937: Applying Rick's patches to convert Ownership Date in Cataloging / Collec...

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 8ccbf8422ad39a361ca88f66119d8efe35fad040..074ee17c4371bcda37948d40c8db4c76e834c26b 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
@@ -300,9 +300,7 @@
     </xs:element>\r
     <xs:element name="ownershipAccess" type="xs:string"/>\r
     <xs:element name="ownershipCategory" type="xs:string"/>\r
-    <!-- FIXME Make into a repeatable, structured date ("date units of information") -->\r
-    <!-- field, when structured dates are introduced -->\r
-    <xs:element name="ownershipDates" type="xs:string"/>\r
+    <xs:element name="ownershipDateGroupList" type="ownershipDateGroupList"/>\r
     <xs:element name="ownershipExchangeMethod" type="xs:string"/>\r
     <xs:element name="ownershipExchangeNote" type="xs:string"/>\r
     <xs:element name="ownershipExchangePriceCurrency" type="xs:string"/>\r
@@ -760,6 +758,13 @@
             <xs:element name="assocPlaceNote" type="xs:string"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
+    \r
+    <xs:complexType name="ownershipDateGroupList">\r
+        <xs:sequence>\r
+            <xs:element name="ownershipDateGroup" type="structuredDateGroup" minOccurs="0"\r
+                maxOccurs="unbounded"/>\r
+        </xs:sequence>\r
+    </xs:complexType>\r
 \r
     <xs:complexType name="usageGroupList">\r
         <xs:sequence>\r

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index 634883d39c6483e347765f12122d0311f8b18373..c27cd2af643e3b797c67ce418a6d6047944484d5 100644 (file)
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -139,7 +139,7 @@
                 <xs:element name="owners" type="ownerList"/>
                 <xs:element name="ownershipAccess" type="xs:string"/>
                 <xs:element name="ownershipCategory" type="xs:string"/>
-                <xs:element name="ownershipDates" type="xs:string"/>
+                <xs:element name="ownershipDateGroupList" type="ownershipDateGroupList"/>
                 <xs:element name="ownershipExchangeMethod" type="xs:string"/>
                 <xs:element name="ownershipExchangeNote" type="xs:string"/>
                 <xs:element name="ownershipExchangePriceCurrency" type="xs:string"/>
@@ -728,6 +728,13 @@
             <xs:element name="assocPlaceNote" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>
+    
+    <xs:complexType name="ownershipDateGroupList">
+        <xs:sequence>
+            <xs:element name="ownershipDateGroup" type="structuredDateGroup" minOccurs="0"
+                maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
 
     <xs:complexType name="ownerList">
         <xs:sequence>

diff --git a/services/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/schemas/media_common.xsd b/services/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/schemas/media_common.xsd
index d3b9f05dc984e6c933869997d1d75964422eaf38..a0c60143a37c35d37126e86c5bc49ddc6dbb807c 100644 (file)
--- a/services/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/schemas/media_common.xsd
+++ b/services/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/schemas/media_common.xsd
@@ -1,115 +1,143 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
-\r
-<!--\r
-    Media schema (XSD)\r
-    \r
-    Entity  : Media\r
-    Part    : Common\r
-    Used for: Nuxeo EP core document type\r
-\r
-    $LastChangedRevision: 2316 $\r
-    $LastChangedDate: 2010-06-02 16:03:51 -0700 (Wed, 02 Jun 2010) $\r
--->\r
-\r
-<xs:schema \r
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
-    xmlns:ns="http://collectionspace.org/media/"\r
-    xmlns="http://collectionspace.org/media/"\r
-    targetNamespace="http://collectionspace.org/media/"\r
-    version="0.1">\r
-    \r
-    <!-- See http://wiki.collectionspace.org/display/collectionspace/Media+Handling+Schema -->\r
-\r
-    <!--  Media Information Group -->\r
-\r
-    <xs:element name="contributor" type="xs:string"/>\r
-    <xs:element name="copyrightStatement" type="xs:string"/>\r
-    <xs:element name="coverage" type="xs:string"/>\r
-    <xs:element name="creator" type="xs:string"/>\r
-    <xs:element name="dateList">\r
-        <xs:complexType>\r
-            <xs:sequence>\r
-                <xs:element name="date" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
-            </xs:sequence>\r
-        </xs:complexType>\r
-    </xs:element>\r
-    <xs:element name="dateCreated" type="xs:string"/>\r
-    <xs:element name="dateModified" type="xs:string"/>\r
-    <xs:element name="description" type="xs:string"/>\r
-\r
-     <!-- Changed name of next field from dimensionGroupList (type="dimensionGroupList") in v1.13 when adding repeatable sub group -->\r
-    <xs:element name="measuredPartGroupList" type="measuredPartGroupList"/>\r
-    <xs:element name="filename" type="xs:string"/>\r
-    <xs:element name="format" type="xs:string"/>\r
-    <xs:element name="identificationNumber" type="xs:string"/>\r
-    <xs:element name="languageList">\r
-        <xs:complexType>\r
-            <xs:sequence>\r
-                <xs:element name="language" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
-            </xs:sequence>\r
-        </xs:complexType>\r
-    </xs:element>\r
-    <xs:element name="location" type="xs:string"/>\r
-    <xs:element name="publisher" type="xs:string"/>\r
-    <xs:element name="relationList">\r
-        <xs:complexType>\r
-            <xs:sequence>\r
-                <xs:element name="relation" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
-            </xs:sequence>\r
-        </xs:complexType>\r
-    </xs:element>\r
-    <xs:element name="rightsHolder" type="xs:string"/>\r
-    <xs:element name="source" type="xs:string"/>\r
-    <xs:element name="sourceUrl" type="xs:string"/>\r
-    <xs:element name="subjectList">\r
-        <xs:complexType>\r
-            <xs:sequence>\r
-                <xs:element name="subject" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
-            </xs:sequence>\r
-        </xs:complexType>\r
-    </xs:element>\r
-    <xs:element name="title" type="xs:string"/>\r
-    <xs:element name="typeList">\r
-        <xs:complexType>\r
-            <xs:sequence>\r
-                <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
-            </xs:sequence>\r
-        </xs:complexType>\r
-    </xs:element>\r
-    <xs:element name="uri" type="xs:string" />\r
-    <xs:element name="blobCsid" type="xs:string" />\r
-\r
-    <!-- Changed names, as of v1.13: dimensionGroupList became measuredPartGroupList, dimensionGroup became measuredPartGroup. -->\r
-    <xs:complexType name="measuredPartGroupList">\r
-        <xs:sequence>\r
-            <xs:element name="measuredPartGroup" type="measuredPartGroup" minOccurs="0"\r
-                maxOccurs="unbounded"/>\r
-        </xs:sequence>\r
-    </xs:complexType>\r
-    <xs:complexType name="measuredPartGroup">\r
-        <xs:sequence>\r
-            <xs:element name="measuredPart" type="xs:string"/>\r
-            <xs:element name="dimensionSummary" type="xs:string"/>\r
-            <xs:element name="dimensionSubGroupList" type="dimensionSubGroupList"/>\r
-        </xs:sequence>\r
-    </xs:complexType>\r
-\r
-    <xs:complexType name="dimensionSubGroupList">\r
-        <xs:sequence>\r
-            <xs:element name="dimensionSubGroup" type="dimensionSubGroup" minOccurs="0" maxOccurs="unbounded" />\r
-        </xs:sequence>\r
-    </xs:complexType>\r
-\r
-    <xs:complexType name="dimensionSubGroup">\r
-        <xs:sequence>\r
-            <xs:element name="dimension" type="xs:string"/>\r
-            <xs:element name="measuredBy" type="xs:string"/>\r
-            <xs:element name="measurementUnit" type="xs:string"/>\r
-            <xs:element name="measurementMethod" type="xs:string"/>\r
-            <xs:element name="value" type="xs:decimal"/>\r
-            <xs:element name="valueDate" type="xs:date"/>\r
-            <xs:element name="valueQualifier" type="xs:string"/>\r
-        </xs:sequence>\r
-    </xs:complexType>\r
-\r
-</xs:schema>\r
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    Media schema (XSD)
+    
+    Entity  : Media
+    Part    : Common
+    Used for: Nuxeo EP core document type
+
+    $LastChangedRevision: 2316 $
+    $LastChangedDate: 2010-06-02 16:03:51 -0700 (Wed, 02 Jun 2010) $
+-->
+
+<xs:schema 
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:ns="http://collectionspace.org/media/"
+    xmlns="http://collectionspace.org/media/"
+    targetNamespace="http://collectionspace.org/media/"
+    version="0.1">
+    
+    <!-- See http://wiki.collectionspace.org/display/collectionspace/Media+Handling+Schema -->
+
+    <!--  Media Information Group -->
+
+    <xs:element name="contributor" type="xs:string"/>
+    <xs:element name="copyrightStatement" type="xs:string"/>
+    <xs:element name="coverage" type="xs:string"/>
+    <xs:element name="creator" type="xs:string"/>
+    <!-- CSPACE-3937 The following field changed from dateList to make it a repeatable structured date -->
+    <xs:element name="dateGroupList" type="dateGroupList"/>
+    <xs:complexType name="dateGroupList">
+        <xs:sequence>
+            <xs:element name="dateGroup" type="dateGroup" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="dateGroup">
+        <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:element name="dateCreated" type="xs:string"/>
+    <xs:element name="dateModified" type="xs:string"/>
+    <xs:element name="description" type="xs:string"/>
+
+     <!-- Changed name of next field from dimensionGroupList (type="dimensionGroupList") in v1.13 when adding repeatable sub group -->
+    <xs:element name="measuredPartGroupList" type="measuredPartGroupList"/>
+    <xs:element name="filename" type="xs:string"/>
+    <xs:element name="format" type="xs:string"/>
+    <xs:element name="identificationNumber" type="xs:string"/>
+    <xs:element name="languageList">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="language" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="location" type="xs:string"/>
+    <xs:element name="publisher" type="xs:string"/>
+    <xs:element name="relationList">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="relation" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="rightsHolder" type="xs:string"/>
+    <xs:element name="source" type="xs:string"/>
+    <xs:element name="sourceUrl" type="xs:string"/>
+    <xs:element name="subjectList">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="subject" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="title" type="xs:string"/>
+    <xs:element name="typeList">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="uri" type="xs:string" />
+    <xs:element name="blobCsid" type="xs:string" />
+
+    <!-- Changed names, as of v1.13: dimensionGroupList became measuredPartGroupList, dimensionGroup became measuredPartGroup. -->
+    <xs:complexType name="measuredPartGroupList">
+        <xs:sequence>
+            <xs:element name="measuredPartGroup" type="measuredPartGroup" minOccurs="0"
+                maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="measuredPartGroup">
+        <xs:sequence>
+            <xs:element name="measuredPart" type="xs:string"/>
+            <xs:element name="dimensionSummary" type="xs:string"/>
+            <xs:element name="dimensionSubGroupList" type="dimensionSubGroupList"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="dimensionSubGroupList">
+        <xs:sequence>
+            <xs:element name="dimensionSubGroup" type="dimensionSubGroup" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="dimensionSubGroup">
+        <xs:sequence>
+            <xs:element name="dimension" type="xs:string"/>
+            <xs:element name="measuredBy" type="xs:string"/>
+            <xs:element name="measurementUnit" type="xs:string"/>
+            <xs:element name="measurementMethod" type="xs:string"/>
+            <xs:element name="value" type="xs:decimal"/>
+            <xs:element name="valueDate" type="xs:date"/>
+            <xs:element name="valueQualifier" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+
+</xs:schema>

diff --git a/services/media/jaxb/src/main/resources/media_common.xsd b/services/media/jaxb/src/main/resources/media_common.xsd
index 2040536da6f24c6cffbec22f99fa141c5bab8e0f..330ba442075c2d1679351175b646eb0dfe56d77b 100644 (file)
--- a/services/media/jaxb/src/main/resources/media_common.xsd
+++ b/services/media/jaxb/src/main/resources/media_common.xsd
@@ -36,7 +36,8 @@
                 <xs:element name="copyrightStatement" type="xs:string"/>
                 <xs:element name="coverage" type="xs:string"/>
                 <xs:element name="creator" type="xs:string"/>
-                <xs:element name="dateList" type="dateList"/>
+                <!--CSPACE-3937: Following field name changed from dateList and made repeatable in v.13 -->
+                <xs:element name="dateGroupList" type="dateGroupList"/>
                 <xs:element name="dateCreated" type="xs:string"/>
                 <xs:element name="dateModified" type="xs:string"/>
                 <xs:element name="description" type="xs:string"/>
@@ -60,7 +61,38 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-
+    <xs:complexType name="dateGroupList">
+        <xs:sequence>
+            <xs:element name="dateGroup" type="dateGroup" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="dateGroup">
+        <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:complexType name="dateList">
         <xs:sequence>
             <xs:element name="date" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
@@ -123,6 +155,5 @@
             <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-
 </xs:schema>