CSPACE-4330: Changed datatypes for numberOfObjects in CollectionObject records to...

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 b639891b1ed7c054809f6cf67c87588c6fab4771..5d46bb54f5426394d8d8e05cff6a7b7f20770788 100755 (executable)
--- 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 1a2186437246901b54fba50555a399fe3d819d63..12397ced93bd8954008ea3b63bcb66588a61b9eb 100755 (executable)
--- 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 5c8a81b8c2383d24f631edefb79d7dc426cd31eb..af570d7ff46ed3e0dc9d0aea811beab8996bfa89 100755 (executable)
--- 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 a83be2855881e2edc5614b16c64af0df4701b062..f7385f0847f364ee0ebf13c5137c24ef1a6fa220 100755 (executable)
--- 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 dd7a6fb1281c4f5cb715e1321bb52313f7559651..2fd9705b137f21d832e34a1fbef03acec59adcc0 100755 (executable)
--- 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 5533a3d09e2072fea64483f74cece1ed9511b628..cb1ae665527cd03183170abba06d7d7d5119e4cb 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
@@ -59,7 +59,8 @@
     <xs:element name="objectPurchaseOfferPriceCurrency" type="xs:string"/>\r
     <xs:element name="objectPurchaseOfferPriceValue" type="xs:string"/>\r
     <xs:element name="objectPurchasePriceCurrency" type="xs:string"/>\r
-    <xs:element name="objectPurchasePriceValue" type="xs:string"/>\r
+    <!-- CSPACE-4330: We may also wish to experiment with xs:decimal or other datatypes -->\r
+    <xs:element name="objectPurchasePriceValue" type="xs:float"/>\r
     <xs:element name="originalObjectPurchasePriceCurrency" type="xs:string"/>\r
     <xs:element name="originalObjectPurchasePriceValue" type="xs:string"/>\r
     <xs:element name="transferOfTitleNumber" type="xs:string"/>\r

diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index 72f7ecbde084d49df5de0780d24fa96946337413..35f37d02e9bc740a76a7ba5a445db584598e6f28 100644 (file)
--- 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 3bc0d725852ecf95f495a71e09314538b1a43046..e5dc1a4a9bdd46d3606520e8b356845a37aba7f2 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
@@ -44,7 +44,7 @@
         </xs:complexType>\r
     </xs:element>\r
     <xs:element name="distinguishingFeatures" type="xs:string"/>\r
-    <xs:element name="numberOfObjects" type="xs:string"/>\r
+    <xs:element name="numberOfObjects" type="xs:integer"/>\r
     <xs:element name="objectNameList" type="ns:objectNameList"/>\r
     <xs:element name="responsibleDepartments">\r
         <xs:complexType>\r

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index 6766e65d65fed67b8ab43f97325ddd476d278be5..ada3d6230e408e23b920253b5b00ecc93bcf9c96 100644 (file)
--- 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"/>