From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 14 Sep 2011 23:27:08 +0000 (+0000)
Subject: CSPACE-4233: Converted services fields in CollectionObject / Cataloging, Acquisition... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=234f36c3519eeba0aa4906a2743092378c93d0dd;p=tmp%2Fjakarta-migration.git

CSPACE-4233: Converted services fields in CollectionObject / Cataloging, Acquisition, Dimension and Media records to integer or decimal datatypes, as appropriate. Also converted apparently internal field in Blob record to decimal datatype, to match its counterpart in Media.
---

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 ea935a506..5046ade10 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
@@ -53,15 +53,15 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="groupPurchasePriceCurrency" type="xs:string"/>
-    <xs:element name="groupPurchasePriceValue" type="xs:string"/>
+    <xs:element name="groupPurchasePriceValue" type="xs:decimal"/>
     <xs:element name="objectOfferPriceCurrency" type="xs:string"/>
-    <xs:element name="objectOfferPriceValue" type="xs:string"/>
+    <xs:element name="objectOfferPriceValue" type="xs:decimal"/>
     <xs:element name="objectPurchaseOfferPriceCurrency" type="xs:string"/>
-    <xs:element name="objectPurchaseOfferPriceValue" type="xs:string"/>
+    <xs:element name="objectPurchaseOfferPriceValue" type="xs:decimal"/>
     <xs:element name="objectPurchasePriceCurrency" type="xs:string"/>
     <xs:element name="objectPurchasePriceValue" type="xs:decimal"/>
     <xs:element name="originalObjectPurchasePriceCurrency" type="xs:string"/>
-    <xs:element name="originalObjectPurchasePriceValue" type="xs:string"/>
+    <xs:element name="originalObjectPurchasePriceValue" type="xs:decimal"/>
     <xs:element name="transferOfTitleNumber" type="xs:string"/>
     <xs:element name="creditLine" type="xs:string"/>
 
@@ -86,7 +86,7 @@
     <xs:complexType name="acquisitionFunding">
         <xs:sequence>
                 <xs:element name="acquisitionFundingCurrency" type="xs:string"/>
-                <xs:element name="acquisitionFundingValue" type="xs:string"/>
+                <xs:element name="acquisitionFundingValue" type="xs:decimal"/>
                 <xs:element name="acquisitionFundingSource" type="xs:string"/>
                 <xs:element name="acquisitionFundingSourceProvisos" type="xs:string"/>
         </xs:sequence>
diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index 00260e18c..d65963550 100644
--- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
+++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
@@ -46,15 +46,15 @@
                 <xs:element name="owners" type="ownerList"/>
                 <xs:element name="acquisitionSources" type="acquisitionSourceList"/>
                 <xs:element name="groupPurchasePriceCurrency" type="xs:string"/>
-                <xs:element name="groupPurchasePriceValue" type="xs:string"/>
+                <xs:element name="groupPurchasePriceValue" type="xs:decimal"/>
                 <xs:element name="objectOfferPriceCurrency" type="xs:string"/>
-                <xs:element name="objectOfferPriceValue" type="xs:string"/>
+                <xs:element name="objectOfferPriceValue" type="xs:decimal"/>
                 <xs:element name="objectPurchaseOfferPriceCurrency" type="xs:string"/>
-                <xs:element name="objectPurchaseOfferPriceValue" type="xs:string"/>
+                <xs:element name="objectPurchaseOfferPriceValue" type="xs:decimal"/>
                 <xs:element name="objectPurchasePriceCurrency" type="xs:string"/>
                 <xs:element name="objectPurchasePriceValue" type="xs:decimal"/>
                 <xs:element name="originalObjectPurchasePriceCurrency" type="xs:string"/>
-                <xs:element name="originalObjectPurchasePriceValue" type="xs:string"/>
+                <xs:element name="originalObjectPurchasePriceValue" type="xs:decimal"/>
                 <xs:element name="transferOfTitleNumber" type="xs:string"/>
                 <xs:element name="creditLine" type="xs:string"/>
                 <!-- Object Collection Information Group -->
@@ -79,7 +79,7 @@
     <xs:complexType name="acquisitionFunding">
         <xs:sequence>
                 <xs:element name="acquisitionFundingCurrency" type="xs:string"/>
-                <xs:element name="acquisitionFundingValue" type="xs:string"/>
+                <xs:element name="acquisitionFundingValue" type="xs:decimal"/>
                 <xs:element name="acquisitionFundingSource" type="xs:string"/>
                 <xs:element name="acquisitionFundingSourceProvisos" type="xs:string"/>
         </xs:sequence>
diff --git a/services/blob/3rdparty/nuxeo-platform-cs-blob/src/main/resources/schemas/blobs_common.xsd b/services/blob/3rdparty/nuxeo-platform-cs-blob/src/main/resources/schemas/blobs_common.xsd
index 8ef243d0c..eb029c315 100644
--- a/services/blob/3rdparty/nuxeo-platform-cs-blob/src/main/resources/schemas/blobs_common.xsd
+++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/src/main/resources/schemas/blobs_common.xsd
@@ -44,7 +44,7 @@
             <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:string"/>
+            <xs:element name="value" type="xs:decimal"/>
             <xs:element name="valueDate" type="xs:string"/>
             <xs:element name="valueQualifier" type="xs:string"/>
         </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 e5dc1a4a9..830bbe8e0 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
@@ -60,7 +60,7 @@
 
     <!-- Object Description Information -->
 
-    <xs:element name="age" type="xs:string"/>
+    <xs:element name="age" type="xs:integer"/>
     <xs:element name="ageQualifier" type="xs:string"/>
     <xs:element name="ageUnit" type="xs:string"/>
     <xs:element name="colors">
@@ -304,7 +304,7 @@
     <xs:element name="ownershipExchangeMethod" type="xs:string"/>
     <xs:element name="ownershipExchangeNote" type="xs:string"/>
     <xs:element name="ownershipExchangePriceCurrency" type="xs:string"/>
-    <xs:element name="ownershipExchangePriceValue" type="xs:string"/>
+    <xs:element name="ownershipExchangePriceValue" type="xs:decimal"/>
     <xs:element name="ownershipPlace" type="xs:string"/>
     <!-- FIXME End of owner repeatable group -->
     <xs:element name="usageGroupList" type="usageGroupList"/>
@@ -472,7 +472,7 @@
             <xs:element name="dimension" type="xs:string"/>
             <xs:element name="measuredPart" type="xs:string"/>
             <xs:element name="measurementUnit" type="xs:string"/>
-            <xs:element name="value" type="xs:string"/>
+            <xs:element name="value" type="xs:decimal"/>
             <xs:element name="valueDate" type="xs:string"/>
             <xs:element name="valueQualifier" type="xs:string"/>
         </xs:sequence>
@@ -531,21 +531,21 @@
         <xs:sequence>
             <xs:element name="dateDisplayDate" type="xs:string"/>
             <xs:element name="dateAssociation" type="xs:string"/>
-            <xs:element name="dateEarliestSingleYear" type="xs:string"/>
-            <xs:element name="dateEarliestSingleMonth" type="xs:string"/>
-            <xs:element name="dateEarliestSingleDay" 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:string"/>
+            <xs:element name="dateEarliestSingleQualifierValue" type="xs:integer"/>
             <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>
-            <xs:element name="dateLatestYear" type="xs:string"/>
-            <xs:element name="dateLatestMonth" type="xs:string"/>
-            <xs:element name="dateLatestDay" 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: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"/>
diff --git a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
index 79b7fc9b8..f6317738a 100644
--- a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
+++ b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
@@ -22,6 +22,8 @@
  */
 package org.collectionspace.services.client.test;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.List;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -74,6 +76,9 @@ public class CollectionObjectServiceTest extends AbstractServiceTestImpl {
     private String knownResourceId = null;
 
     private final String OBJECT_NAME_VALUE = "an object name";
+    private final BigInteger AGE_VALUE = new BigInteger("55");
+    private final BigDecimal DIMENSION_VALUE_LENGTH = new BigDecimal("0.009");
+    private final BigDecimal DIMENSION_VALUE_WIDTH = new BigDecimal("3087.56");
     private final String UPDATED_MEASURED_PART_VALUE = "updated measured part value";
     private final String UTF8_DATA_SAMPLE = "Audiorecording album cover signed by Lech "
             + "Wa" + '\u0142' + '\u0119' + "sa";
@@ -1222,7 +1227,7 @@ public class CollectionObjectServiceTest extends AbstractServiceTestImpl {
         
         // Scalar fields
         collectionObject.setObjectNumber(objectNumber);
-        collectionObject.setAge(""); //test for null string
+        collectionObject.setAge(AGE_VALUE); //test for null string
         
         // FIXME this can be removed when the repeatable other number list
         // is supported by the application layers
@@ -1249,12 +1254,12 @@ public class CollectionObjectServiceTest extends AbstractServiceTestImpl {
         DimensionGroup dimensionGroup1 = new DimensionGroup();
         dimensionGroup1.setMeasuredPart("head");
         dimensionGroup1.setDimension("length");
-        dimensionGroup1.setValue("30");
+        dimensionGroup1.setValue(DIMENSION_VALUE_LENGTH);
         dimensionGroup1.setMeasurementUnit("cm");
         DimensionGroup dimensionGroup2 = new DimensionGroup();
         dimensionGroup2.setMeasuredPart("leg");
         dimensionGroup2.setDimension("width");
-        dimensionGroup2.setValue("2.57");
+        dimensionGroup2.setValue(DIMENSION_VALUE_WIDTH);
         dimensionGroup2.setMeasurementUnit("m");
         dimensionGroup2.setValueQualifier("");  // test null string
         dimensionGroups.add(dimensionGroup1);
diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index ada3d6230..4a91f29e8 100644
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -55,7 +55,7 @@
                 <xs:element name="recordStatus" type="xs:string"/>
 
                 <!-- Object Description Information -->
-                <xs:element name="age" type="xs:string"/>
+                <xs:element name="age" type="xs:integer"/>
                 <xs:element name="ageQualifier" type="xs:string"/>
                 <xs:element name="ageUnit" type="xs:string"/>
                 <xs:element name="colors" type="colorList"/>
@@ -177,7 +177,7 @@
                 <xs:element name="ownershipExchangeMethod" type="xs:string"/>
                 <xs:element name="ownershipExchangeNote" type="xs:string"/>
                 <xs:element name="ownershipExchangePriceCurrency" type="xs:string"/>
-                <xs:element name="ownershipExchangePriceValue" type="xs:string"/>
+                <xs:element name="ownershipExchangePriceValue" type="xs:decimal"/>
                 <xs:element name="ownershipPlace" type="xs:string"/>
                 <xs:element name="usageGroupList" type="usageGroupList"/>
 
@@ -386,7 +386,7 @@
             <xs:element name="dimension" type="xs:string"/>
             <xs:element name="measuredPart" type="xs:string"/>
             <xs:element name="measurementUnit" type="xs:string"/>
-            <xs:element name="value" type="xs:string"/>
+            <xs:element name="value" type="xs:decimal"/>
             <xs:element name="valueDate" type="xs:string"/>
             <xs:element name="valueQualifier" type="xs:string"/>
         </xs:sequence>
@@ -463,21 +463,21 @@
         <xs:sequence>
             <xs:element name="dateDisplayDate" type="xs:string"/>
             <xs:element name="dateAssociation" type="xs:string"/>
-            <xs:element name="dateEarliestSingleYear" type="xs:string"/>
-            <xs:element name="dateEarliestSingleMonth" type="xs:string"/>
-            <xs:element name="dateEarliestSingleDay" 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:string"/>
+            <xs:element name="dateEarliestSingleQualifierValue" type="xs:integer"/>
             <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>
-            <xs:element name="dateLatestYear" type="xs:string"/>
-            <xs:element name="dateLatestMonth" type="xs:string"/>
-            <xs:element name="dateLatestDay" 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: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"/>
diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/schemas/dimensions_common.xsd b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/schemas/dimensions_common.xsd
index 4d0dcf6a7..592255838 100644
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/schemas/dimensions_common.xsd
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/schemas/dimensions_common.xsd
@@ -24,7 +24,7 @@
     <xs:element name="dimension" type="xs:string"/>
     <xs:element name="measuredPart" type="xs:string"/>
     <xs:element name="measurementUnit" type="xs:string"/>
-    <xs:element name="value" type="xs:string"/>
+    <xs:element name="value" type="xs:decimal"/>
     <xs:element name="valueDate" type="xs:string"/>
     <xs:element name="valueQualifier" type="xs:string"/>
     
diff --git a/services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionServiceTest.java b/services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionServiceTest.java
index e546a0810..866dff8ee 100644
--- a/services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionServiceTest.java
+++ b/services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionServiceTest.java
@@ -23,6 +23,7 @@
 package org.collectionspace.services.client.test;
 
 //import java.util.ArrayList;
+import java.math.BigDecimal;
 import java.util.List;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -66,6 +67,7 @@ public class DimensionServiceTest extends AbstractServiceTestImpl {
     /** The SERVIC e_ pat h_ component. */
     /** The known resource id. */
     private String knownResourceId = null;
+    private final String DIMENSION_VALUE = "78.306";
 
 	@Override
 	protected String getServiceName() {
@@ -435,7 +437,7 @@ public class DimensionServiceTest extends AbstractServiceTestImpl {
         Assert.assertNotNull(dimensionsCommon);
 
         // Update the content of this resource.
-        dimensionsCommon.setValue("updated-" + dimensionsCommon.getValue());
+        dimensionsCommon.setValue(dimensionsCommon.getValue().multiply(new BigDecimal("2.0")));
         dimensionsCommon.setValueDate("updated-" + dimensionsCommon.getValueDate());
         if (logger.isDebugEnabled()) {
             logger.debug("to be updated object");
@@ -745,7 +747,7 @@ public class DimensionServiceTest extends AbstractServiceTestImpl {
     private PoxPayloadOut createDimensionInstance(String commonPartName, String identifier) {
         return createDimensionInstance(commonPartName, 
                 "dimensionType-" + identifier,
-                "entryNumber-" + identifier,
+                DIMENSION_VALUE,
                 "entryDate-" + identifier);
     }
 
@@ -757,10 +759,10 @@ public class DimensionServiceTest extends AbstractServiceTestImpl {
      * @param entryDate the entry date
      * @return the multipart output
      */
-    private PoxPayloadOut createDimensionInstance(String commonPartName, String dimensionType, String entryNumber, String entryDate) {
+    private PoxPayloadOut createDimensionInstance(String commonPartName, String dimensionType, String dimensionValue, String entryDate) {
         DimensionsCommon dimensionsCommon = new DimensionsCommon();
         dimensionsCommon.setDimension(dimensionType);
-        dimensionsCommon.setValue(entryNumber);
+        dimensionsCommon.setValue(new BigDecimal(dimensionValue));
         dimensionsCommon.setValueDate(entryDate);
         PoxPayloadOut multipart = DimensionFactory.createDimensionInstance(
                 commonPartName, dimensionsCommon);
diff --git a/services/dimension/jaxb/src/main/resources/dimensions-common.xsd b/services/dimension/jaxb/src/main/resources/dimensions-common.xsd
index ddbdb0cae..6d16a4562 100644
--- a/services/dimension/jaxb/src/main/resources/dimensions-common.xsd
+++ b/services/dimension/jaxb/src/main/resources/dimensions-common.xsd
@@ -34,7 +34,7 @@
                 <xs:element name="dimension" type="xs:string"/>
                 <xs:element name="measuredPart" type="xs:string"/>
                 <xs:element name="measurementUnit" type="xs:string"/>
-                <xs:element name="value" type="xs:string"/>
+                <xs:element name="value" type="xs:decimal"/>
                 <xs:element name="valueDate" type="xs:string"/>
                 <xs:element name="valueQualifier" type="xs:string"/>
             </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 1908b5b20..74e1265db 100644
--- 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
@@ -91,7 +91,7 @@
             <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:string"/>
+            <xs:element name="value" type="xs:decimal"/>
             <xs:element name="valueDate" type="xs:string"/>
             <xs:element name="valueQualifier" type="xs:string"/>
         </xs:sequence>
diff --git a/services/media/jaxb/src/main/resources/media_common.xsd b/services/media/jaxb/src/main/resources/media_common.xsd
index a0e58ce27..8150912dc 100644
--- a/services/media/jaxb/src/main/resources/media_common.xsd
+++ b/services/media/jaxb/src/main/resources/media_common.xsd
@@ -80,7 +80,7 @@
             <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:string"/>
+            <xs:element name="value" type="xs:decimal"/>
             <xs:element name="valueDate" type="xs:string"/>
             <xs:element name="valueQualifier" type="xs:string"/>
         </xs:sequence>