From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 24 Feb 2011 06:26:18 +0000 (+0000)
Subject: CSPACE-3267,CSPACE-3501,CSPACE-3502: Commit Rick's changes to acquisition to add... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=55701e575d8eeddb09a32ed4de8d227497b8fe09;p=tmp%2Fjakarta-migration.git

CSPACE-3267,CSPACE-3501,CSPACE-3502: Commit Rick's changes to acquisition to add Credit Line field, to cataloging to make Object Status repeatable, and to make Reference a group repeatable with changes to fields in that group.
---

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 22ab28300..5533a3d09 100644
--- 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"/>
     <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 -->
 
diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index 6fc452e43..899a93b54 100644
--- 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 a238c8a4e..70f7d1531 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
@@ -200,7 +200,7 @@
 
     <!-- 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"/>
@@ -342,15 +342,8 @@
     <xs:element name="viewersContributionNote" type="xs:string"/>
 
     <!-- Reference Information -->
-
-    <xs:element name="references">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="reference" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="catalogNumber" type="xs:string"/>
+    
+    <xs:element name="referenceGroupList" type="referenceGroupList"/>
 
     <!--  Object Collection Information Group -->
 
@@ -505,6 +498,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="technicalAttributeGroupList">
         <xs:sequence>
@@ -741,6 +740,19 @@
         </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>
+    
     <!-- Object Description Date Information -->
     <!-- This appears to be a placeholder structured date -->
     <xs:element name="dateAssociation" type="xs:string"/>
diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index d5cb4ab9e..fd341593d 100644
--- 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>