From 0eb73146b9ce35a6f9174d9917575a85df3b7819 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 2 Sep 2011 00:23:29 +0000
Subject: [PATCH] CSPACE-4330: Changed datatypes for numberOfObjects in
 CollectionObject records to xs:integer (which converts field to bigint type
 in PostgreSQL) and for objectPurchasePriceValue in Acquisition records to
 xs:float (double precision in PostgreSQL). Services tests pass, but it would
 be desirable to add tests for these fields. We may also want to consider
 xs:decimal type for currency types.

---
 .../test-data/xmlreplay/collectionobject/repfield_whitesp1.xml | 2 +-
 .../test-data/xmlreplay/collectionobject/repfield_whitesp2.xml | 2 +-
 .../test-data/xmlreplay/collectionobject/repfield_whitesp3.xml | 2 +-
 .../test-data/xmlreplay/collectionobject/repfield_whitesp4.xml | 2 +-
 .../test-data/xmlreplay/collectionobject/testCambridge.xml     | 2 +-
 .../src/main/resources/schemas/acquisitions_common.xsd         | 3 ++-
 .../jaxb/src/main/resources/acquisitions_common.xsd            | 3 ++-
 .../src/main/resources/schemas/collectionobjects_common.xsd    | 2 +-
 .../jaxb/src/main/resources/collectionobjects_common.xsd       | 2 +-
 9 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp1.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp1.xml
index b639891b1..5d46bb54f 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp1.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp1.xml
@@ -3,7 +3,7 @@
 <objectNumber>objectNumber</objectNumber>
 <briefDescriptions> <briefDescription> briefDescription</briefDescription></briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
-<numberOfObjects>numberOfObjects</numberOfObjects>
+<numberOfObjects>1</numberOfObjects>
 <!-- test whitespace as first child node -->
 <responsibleDepartments> <responsibleDepartment> responsibleDept1</responsibleDepartment><responsibleDepartment>responsibleDept2</responsibleDepartment></responsibleDepartments>
 <titleGroupList><titleGroup><title>title</title></titleGroup></titleGroupList>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml
index 1a2186437..12397ced9 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml
@@ -9,7 +9,7 @@
 <briefDescription>briefDescription2</briefDescription>
 </briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
-<numberOfObjects>numberOfObjects</numberOfObjects>
+<numberOfObjects>1</numberOfObjects>
 <!-- test newline whitespace -->
 <responsibleDepartments>
 <responsibleDepartment>responsibleDept1</responsibleDepartment>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml
index 5c8a81b8c..af570d7ff 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml
@@ -11,7 +11,7 @@
 </briefDescriptions>
 
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
-<numberOfObjects>numberOfObjects</numberOfObjects>
+<numberOfObjects>1</numberOfObjects>
 <!-- test newline whitespace -->
 <responsibleDepartments>
 <!-- test childnode as whitespace -->
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml
index a83be2855..f7385f084 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml
@@ -9,7 +9,7 @@
     <briefDescription>briefDescription2</briefDescription>
 </briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
-<numberOfObjects>numberOfObjects</numberOfObjects>
+<numberOfObjects>1</numberOfObjects>
 <!-- test newline and tab whitespace -->
 <responsibleDepartments>
     <responsibleDepartment>responsibleDept1</responsibleDepartment>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml
index dd7a6fb12..2fd9705b1 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml
@@ -6,7 +6,7 @@
   <!-- briefDescription>briefDescription</briefDescription -->
   <comments>comments</comments>
   <distinguishingFeatures>distFeatures</distinguishingFeatures>
-  <numberOfObjects>numberOfObjects</numberOfObjects>
+  <numberOfObjects>1</numberOfObjects>
   <responsibleDepartments>
   </responsibleDepartments>
   <titleGroupList>
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 5533a3d09..cb1ae6655 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
@@ -59,7 +59,8 @@
     <xs:element name="objectPurchaseOfferPriceCurrency" type="xs:string"/>
     <xs:element name="objectPurchaseOfferPriceValue" type="xs:string"/>
     <xs:element name="objectPurchasePriceCurrency" type="xs:string"/>
-    <xs:element name="objectPurchasePriceValue" type="xs:string"/>
+    <!-- CSPACE-4330: We may also wish to experiment with xs:decimal or other datatypes -->
+    <xs:element name="objectPurchasePriceValue" type="xs:float"/>
     <xs:element name="originalObjectPurchasePriceCurrency" type="xs:string"/>
     <xs:element name="originalObjectPurchasePriceValue" type="xs:string"/>
     <xs:element name="transferOfTitleNumber" type="xs:string"/>
diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index 72f7ecbde..35f37d02e 100644
--- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
+++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
@@ -52,7 +52,8 @@
                 <xs:element name="objectPurchaseOfferPriceCurrency" type="xs:string"/>
                 <xs:element name="objectPurchaseOfferPriceValue" type="xs:string"/>
                 <xs:element name="objectPurchasePriceCurrency" type="xs:string"/>
-                <xs:element name="objectPurchasePriceValue" type="xs:string"/>
+                <!-- CSPACE-4330: We may also wish to experiment with xs:decimal or other datatypes -->
+                <xs:element name="objectPurchasePriceValue" type="xs:float"/>
                 <xs:element name="originalObjectPurchasePriceCurrency" type="xs:string"/>
                 <xs:element name="originalObjectPurchasePriceValue" type="xs:string"/>
                 <xs:element name="transferOfTitleNumber" type="xs:string"/>
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 3bc0d7258..e5dc1a4a9 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
@@ -44,7 +44,7 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="distinguishingFeatures" type="xs:string"/>
-    <xs:element name="numberOfObjects" type="xs:string"/>
+    <xs:element name="numberOfObjects" type="xs:integer"/>
     <xs:element name="objectNameList" type="ns:objectNameList"/>
     <xs:element name="responsibleDepartments">
         <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 6766e65d6..ada3d6230 100644
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -47,7 +47,7 @@
                 <xs:element name="briefDescriptions" type="briefDescriptionList"/>
                 <xs:element name="comments" type="commentList"/>
                 <xs:element name="distinguishingFeatures" type="xs:string"/>
-                <xs:element name="numberOfObjects" type="xs:string"/>
+                <xs:element name="numberOfObjects" type="xs:integer"/>
                 <xs:element name="objectNameList" type="ns:objectNameList"/>
                 <xs:element name="responsibleDepartments" type="responsibleDepartmentList"/>
                 <xs:element name="collection" type="xs:string"/>
-- 
2.47.3