CSPACE-3267,CSPACE-3501,CSPACE-3502: Commit Rick's changes to acquisition to add...

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
index 22ab28300b044a0f27557ea9664333e1ca5bcca7..5533a3d09e2072fea64483f74cece1ed9511b628 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
@@ -63,6 +63,7 @@
     <xs:element name="originalObjectPurchasePriceCurrency" type="xs:string"/>\r
     <xs:element name="originalObjectPurchasePriceValue" type="xs:string"/>\r
     <xs:element name="transferOfTitleNumber" type="xs:string"/>\r
+    <xs:element name="creditLine" type="xs:string"/>\r
 \r
     <!-- Object Collection Information Group -->\r
 \r

diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index 6fc452e43031fe97e3d0812a1afedbb1525024d8..899a93b544c38d1aa4b9db0065834e74d7218fc7 100644 (file)
--- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
+++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
@@ -56,6 +56,7 @@
                 <xs:element name="originalObjectPurchasePriceCurrency" type="xs:string"/>
                 <xs:element name="originalObjectPurchasePriceValue" type="xs:string"/>
                 <xs:element name="transferOfTitleNumber" type="xs:string"/>
+                <xs:element name="creditLine" type="xs:string"/>
                 <!-- Object Collection Information Group -->
                 <xs:element name="fieldCollectionEventNames" type="fieldCollectionEventNameList"/>
             </xs:sequence>

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 a238c8a4e9b54a8855775793fc7167fde4e1338d..70f7d15315dfe3d31a2c7d6db02f38ac5a5dada4 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
@@ -200,7 +200,7 @@
 \r
     <!-- Misc Object Description Information -->\r
 \r
-    <xs:element name="objectStatus" type="xs:string"/>\r
+    <xs:element name="objectStatusList" type="objectStatusList" />     \r
     <xs:element name="phase" type="xs:string"/>\r
     <xs:element name="physicalDescription" type="xs:string"/>\r
     <xs:element name="sex" type="xs:string"/>\r
@@ -342,15 +342,8 @@
     <xs:element name="viewersContributionNote" type="xs:string"/>\r
 \r
     <!-- Reference Information -->\r
-\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
+    <xs:element name="referenceGroupList" type="referenceGroupList"/>\r
 \r
     <!--  Object Collection Information Group -->\r
 \r
@@ -505,6 +498,12 @@
             <xs:element name="materialSource" type="xs:string"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
+    \r
+       <xs:complexType name="objectStatusList">\r
+               <xs:sequence>\r
+                       <xs:element name="objectStatus" type="xs:string" minOccurs="0" maxOccurs="unbounded" />\r
+               </xs:sequence>\r
+       </xs:complexType>\r
 \r
     <xs:complexType name="technicalAttributeGroupList">\r
         <xs:sequence>\r
@@ -741,6 +740,19 @@
         </xs:sequence>\r
     </xs:complexType>\r
     \r
+       <xs:complexType name="referenceGroupList">\r
+               <xs:sequence>\r
+                       <xs:element name="referenceGroup" type="referenceGroup" minOccurs="0" maxOccurs="unbounded"/>\r
+               </xs:sequence>\r
+       </xs:complexType>\r
+        \r
+       <xs:complexType name="referenceGroup">\r
+               <xs:sequence>\r
+                       <xs:element name="reference" type="xs:string"/>\r
+                       <xs:element name="referenceNote" type="xs:string"/>\r
+               </xs:sequence>\r
+       </xs:complexType>\r
+    \r
     <!-- Object Description Date Information -->\r
     <!-- This appears to be a placeholder structured date -->\r
     <xs:element name="dateAssociation" type="xs:string"/>\r

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index d5cb4ab9ee938b2366ca070335e522c0d41b9630..fd341593df36e41484b217a0749ce0cf98d3dd97 100644 (file)
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -124,7 +124,7 @@
                 <xs:element name="materialGroupList" type="materialGroupList"/>
 
                 <!-- Misc Object Description Information -->
-                <xs:element name="objectStatus" type="xs:string"/>
+                <xs:element name="objectStatusList" type="objectStatusList"/>
                 <xs:element name="phase" type="xs:string"/>
                 <xs:element name="physicalDescription" type="xs:string"/>
                 <xs:element name="sex" type="xs:string"/>
@@ -193,8 +193,8 @@
                 <xs:element name="viewersContributionNote" type="xs:string"/>
 
                 <!-- Reference Information -->
-                <xs:element name="references" type="referenceList"/>
-                <xs:element name="catalogNumber" type="xs:string"/>
+                <!-- Changed in CSPACE-3501; catalog number renamed Reference Note -->
+                <xs:element name="referenceGroupList" type="referenceGroupList"/>
 
                 <!--  Object Collection Information Group -->
                 <xs:element name="fieldCollectionDate" type="xs:string"/>
@@ -423,6 +423,12 @@
             <xs:element name="materialSource" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>
+    
+       <xs:complexType name="objectStatusList">
+               <xs:sequence>
+                       <xs:element name="objectStatus" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+               </xs:sequence>
+       </xs:complexType>
 
     <xs:complexType name="styleList">
         <xs:sequence>
@@ -719,11 +725,18 @@
         </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="referenceGroupList">
+               <xs:sequence>
+                       <xs:element name="referenceGroup" type="referenceGroup" minOccurs="0" maxOccurs="unbounded"/>
+               </xs:sequence>
+       </xs:complexType>
+        
+       <xs:complexType name="referenceGroup">
+               <xs:sequence>
+                       <xs:element name="reference" type="xs:string"/>
+                       <xs:element name="referenceNote" type="xs:string"/>
+               </xs:sequence>
+       </xs:complexType>
 
     <xs:complexType name="fieldCollectionMethodList">
         <xs:sequence>