CSPACE-1227,CSPACE-1916: Filled out CollectionObject schema, in the Services Layer...

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 a57f265552f057ab6fb898882a98f18ed8d772f2..286256e1015ae74cf884367037b95562156f9f7e 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
@@ -40,6 +40,16 @@
     <xs:element name="otherNumberType" type="xs:string"/>\r
 \r
     <xs:element name="briefDescription" type="xs:string"/>\r
+    <!--\r
+        <xs:element name="briefDescriptions" type="xs:string"/>\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="briefDescription" type="xs:string"\r
+                    minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    -->\r
     <xs:element name="comments" type="xs:string"/>\r
     <xs:element name="distinguishingFeatures" type="xs:string"/>\r
     <xs:element name="numberOfObjects" type="xs:string"/>\r
@@ -142,6 +152,73 @@
     <xs:element name="objectComponentName" type="xs:string"/>\r
     <xs:element name="objectComponentInformation" type="xs:string"/>\r
 \r
+    <!-- Object Production Information -->\r
+    <xs:element name="objectProductionDate" type="xs:string" />\r
+    <xs:element name="objectProductionNote" type="xs:string" />\r
+    <xs:element name="objectProductionOrganization" type="xs:string" />\r
+    <xs:element name="objectProductionPeople" type="xs:string" />\r
+    <xs:element name="objectProductionPerson" type="xs:string" />\r
+    <xs:element name="objectProductionPlace" type="xs:string" />\r
+    <xs:element name="objectProductionReason" type="xs:string" />\r
+    <xs:element name="technique" type="xs:string" />\r
+    <xs:element name="techniqueType" type="xs:string" />\r
+\r
+    <!-- Object History and Association Information - Association -->\r
+    <xs:element name="associatedActivityNote" type="xs:string" />\r
+    <xs:element name="associatedConcept" type="xs:string" />\r
+    <xs:element name="associatedCulturalAffinity" type="xs:string" />\r
+    <xs:element name="associatedDate" type="xs:string" />\r
+    <xs:element name="associatedEventName" type="xs:string" />\r
+    <xs:element name="associatedEventNameType" type="xs:string" />\r
+    <xs:element name="associatedEventOrganization" type="xs:string" />\r
+    <xs:element name="associatedEventPeople" type="xs:string" />\r
+    <xs:element name="associatedEventPerson" type="xs:string" />\r
+    <xs:element name="associatedEventPlace" type="xs:string" />\r
+    <xs:element name="associatedObject" type="xs:string" />\r
+    <xs:element name="associatedOrganization" type="xs:string" />\r
+    <xs:element name="associatedPeople" type="xs:string" />\r
+    <xs:element name="associatedPerson" type="xs:string" />\r
+    <xs:element name="associatedPlace" type="xs:string" />\r
+    <xs:element name="associationNote" type="xs:string" />\r
+    <xs:element name="associationType" type="xs:string" />\r
+\r
+    <!-- Object History and Association Information - History -->\r
+    <xs:element name="objectHistoryNote" type="xs:string" />\r
+    <xs:element name="owner" type="xs:string" />\r
+    <xs:element name="ownershipAccess" type="xs:string" />\r
+    <xs:element name="ownershipCategory" type="xs:string" />\r
+    <xs:element name="ownershipDates" type="xs:string" />\r
+    <xs:element name="ownershipExchangeMethod" type="xs:string" />\r
+    <xs:element name="ownershipExchangeNote" type="xs:string" />\r
+    <xs:element name="ownershipExchangePriceDenomination" type="xs:string" />\r
+    <xs:element name="ownershipExchangePriceValue" type="xs:string" />\r
+    <xs:element name="ownershipPlace" type="xs:string" />\r
+    <xs:element name="usage" type="xs:string" />\r
+    <xs:element name="usageNote" type="xs:string" />\r
+\r
+    <!-- Object Owner's Contribution Information -->\r
+    <xs:element name="ownersPersonalExperience" type="xs:string" />\r
+    <xs:element name="ownersPersonalResponse" type="xs:string" />\r
+    <xs:element name="ownersReference" type="xs:string" />\r
+    <xs:element name="ownersContributionNote" type="xs:string" />\r
+\r
+    <!-- Object Viewers Contribution Information -->\r
+    <xs:element name="viewersRole" type="xs:string" />\r
+    <xs:element name="viewersPersonalExperience" type="xs:string" />\r
+    <xs:element name="viewersPersonalResponse" type="xs:string" />\r
+    <xs:element name="viewersReference" type="xs:string" />\r
+    <xs:element name="viewersContributionNote" type="xs:string" />\r
+\r
+    <!-- Reference Information -->\r
+    <xs:element name="reference" type="xs:string" />\r
+    <xs:element name="catalogNumber" type="xs:string" />\r
+\r
+    <!-- Object Collection Information -->\r
+    <xs:element name="fieldCollectionEventName" type="xs:string" />\r
+\r
+    <!-- Object Description Date Information -->\r
+    <!-- This appears to be a placeholder structured date -->\r
+\r
     <!-- Object description: Date information -->\r
     <xs:element name="dateAssociation" type="xs:string"/>\r
     <xs:element name="dateEarliestSingle" type="xs:string"/>\r

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 0e1e8c350e61052002fe56d46844cf2c8493f044..ff96591c388536f560da6cebc637760a1c1e0028 100644 (file)
--- 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
@@ -30,6 +30,7 @@ import javax.ws.rs.core.Response;
 import org.collectionspace.services.client.CollectionObjectClient;
 import org.collectionspace.services.client.CollectionObjectFactory;
 import org.collectionspace.services.client.CollectionSpaceClient;
+import org.collectionspace.services.collectionobject.BriefDescriptionList;
 import org.collectionspace.services.collectionobject.CollectionobjectsCommon;
 import org.collectionspace.services.collectionobject.domain.naturalhistory.CollectionobjectsNaturalhistory;
 import org.collectionspace.services.collectionobject.CollectionobjectsCommonList;
@@ -1050,7 +1051,15 @@ public class CollectionObjectServiceTest extends AbstractServiceTestImpl {
     private MultipartOutput createCollectionObjectInstance(String commonPartName,
             String objectNumber, String objectName) {
         CollectionobjectsCommon collectionObject = new CollectionobjectsCommon();
-        
+
+ /*
+        BriefDescriptionList descriptionList = new BriefDescriptionList();
+        List<String> descriptions = descriptionList.getBriefDescription();
+        descriptions.add("Papier mache bird cow mask with horns, "
+                + "painted red with black and yellow spots. "
+                + "Puerto Rico. ca. 8&quot; high, 6&quot; wide, projects 10&quot; (with horns).");
+ */
+
         ResponsibleDepartmentList deptList = new ResponsibleDepartmentList();
         List<String> depts = deptList.getResponsibleDepartment();
         // @TODO Use properly formatted refNames for representative departments
@@ -1088,6 +1097,7 @@ public class CollectionObjectServiceTest extends AbstractServiceTestImpl {
         
         collectionObject.setObjectName(objectName);
         collectionObject.setAge(""); //test for null string
+        // collectionObject.setBriefDescriptions(descriptionList);
         collectionObject.setBriefDescription("Papier mache bird cow mask with horns, "
                 + "painted red with black and yellow spots. "
                 + "Puerto Rico. ca. 8&quot; high, 6&quot; wide, projects 10&quot; (with horns).");

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index 3c4b69a8cfb7fc775f8decc79667cdbe380f9e28..2a43a7b9dc373742698efe0a843de9eb3bc879e5 100644 (file)
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -45,15 +45,18 @@
             <xs:sequence>
                 <xs:element name="csid" type="xs:string" />
                 
-                <!-- Object identification information -->
+                <!-- Object Identification Information -->
                 <xs:element name="objectNumber" type="xs:string"/>
                 <xs:element name="otherNumberList" type="ns:otherNumberList" />
                 
-                <!-- Remove these two elements when the App/UI layer is using the new repeatable 'otherNumbers' field -->
+                <!-- Remove these two elements when the App/UI layer is -->
+                <!-- using the new repeatable 'otherNumbers' field -->
                 <xs:element name="otherNumber" type="xs:string"/>
                 <xs:element name="otherNumberType" type="xs:string"/>
 
                 <xs:element name="briefDescription" type="xs:string"/>
+                <!-- xs:element name="briefDescriptions" type="briefDescriptionList"/ -->
+
                 <xs:element name="comments" type="xs:string"/>
                 <xs:element name="distinguishingFeatures" type="xs:string"/>
                 <xs:element name="numberOfObjects" type="xs:string"/>
@@ -70,13 +73,13 @@
                 <xs:element name="titleTranslation" type="xs:string"/>
                 <xs:element name="titleType" type="xs:string"/>
 
-                <!-- Object description information -->
+                <!-- Object Description Information -->
                 <xs:element name="age" type="xs:string" />
                 <xs:element name="ageQualifier" type="xs:string" />
                 <xs:element name="ageUnit" type="xs:string" />
                 <xs:element name="color" type="xs:string" />
 
-                <!-- Object description Content information -->
+                <!-- Object Description - Content Information -->
                 <xs:element name="contentActivity" type="xs:string" />
                 <xs:element name="contentConcept" type="xs:string" />
                 <xs:element name="contentDate" type="xs:string" />
@@ -98,7 +101,7 @@
 
                 <xs:element name="copyNumber" type="xs:string" />
 
-                <!-- Object description Dimension information -->
+                <!-- Object Description - Dimension Information -->
                 <xs:element name="dimension" type="xs:string" />
                 <xs:element name="dimensionMeasuredPart" type="xs:string" />
                 <xs:element name="dimensionMeasurementUnit" type="xs:string" />
@@ -109,7 +112,7 @@
                 <xs:element name="editionNumber" type="xs:string" />
                 <xs:element name="form" type="xs:string" />
 
-                <!-- Object description Inscription content information -->
+                <!-- Object description Inscription - Content Information -->
                 <xs:element name="inscriptionContent" type="xs:string" />
                 <xs:element name="inscriber" type="xs:string" />
                 <xs:element name="inscriptionDate" type="xs:string" />
@@ -122,7 +125,7 @@
                 <xs:element name="inscriptionTransliteration" type="xs:string" />
                 <xs:element name="inscriptionType" type="xs:string" />
                 
-                <!-- Object description Inscription description information -->
+                <!-- Object Description Inscription - Description Information -->
                 <xs:element name="inscriptionDescription" type="xs:string" />
                 <xs:element name="inscriptionDescriptionInscriber" type="xs:string" />
                 <xs:element name="inscriptionDescriptionDate" type="xs:string" />
@@ -131,14 +134,14 @@
                 <xs:element name="inscriptionDescriptionPosition" type="xs:string" />
                 <xs:element name="inscriptionDescriptionType" type="xs:string" />
 
-                <!-- Object description Material information -->
+                <!-- Object Description Material Information -->
                 <xs:element name="material" type="xs:string" />
                 <xs:element name="materialComponent" type="xs:string" />
                 <xs:element name="materialComponentNote" type="xs:string" />
                 <xs:element name="materialName" type="xs:string" />
                 <xs:element name="materialSource" type="xs:string" />
 
-                <!-- Misc Object description information -->
+                <!-- Misc Object Description Information -->
                 <xs:element name="objectStatus" type="xs:string" />
                 <xs:element name="phase" type="xs:string" />
                 <xs:element name="physicalDescription" type="xs:string" />
@@ -149,8 +152,73 @@
                 <xs:element name="technicalAttributeMeasurementUnit" type="xs:string" />
                 <xs:element name="objectComponentName" type="xs:string" />
                 <xs:element name="objectComponentInformation" type="xs:string" />
+
+                <!-- Object Production Information -->
+                <xs:element name="objectProductionDate" type="xs:string" />
+                <xs:element name="objectProductionNote" type="xs:string" />
+                <xs:element name="objectProductionOrganization" type="xs:string" />
+                <xs:element name="objectProductionPeople" type="xs:string" />
+                <xs:element name="objectProductionPerson" type="xs:string" />
+                <xs:element name="objectProductionPlace" type="xs:string" />
+                <xs:element name="objectProductionReason" type="xs:string" />
+                <xs:element name="technique" type="xs:string" />
+                <xs:element name="techniqueType" type="xs:string" />
+
+                <!-- Object History and Association Information - Association -->
+                <xs:element name="associatedActivityNote" type="xs:string" />
+                <xs:element name="associatedConcept" type="xs:string" />
+                <xs:element name="associatedCulturalAffinity" type="xs:string" />
+                <xs:element name="associatedDate" type="xs:string" />
+                <xs:element name="associatedEventName" type="xs:string" />
+                <xs:element name="associatedEventNameType" type="xs:string" />
+                <xs:element name="associatedEventOrganization" type="xs:string" />
+                <xs:element name="associatedEventPeople" type="xs:string" />
+                <xs:element name="associatedEventPerson" type="xs:string" />
+                <xs:element name="associatedEventPlace" type="xs:string" />
+                <xs:element name="associatedObject" type="xs:string" />
+                <xs:element name="associatedOrganization" type="xs:string" />
+                <xs:element name="associatedPeople" type="xs:string" />
+                <xs:element name="associatedPerson" type="xs:string" />
+                <xs:element name="associatedPlace" type="xs:string" />
+                <xs:element name="associationNote" type="xs:string" />
+                <xs:element name="associationType" type="xs:string" />
+
+                <!-- Object History and Association Information - History -->
+                <xs:element name="objectHistoryNote" type="xs:string" />
+                <xs:element name="owner" type="xs:string" />
+                <xs:element name="ownershipAccess" type="xs:string" />
+                <xs:element name="ownershipCategory" type="xs:string" />
+                <xs:element name="ownershipDates" type="xs:string" />
+                <xs:element name="ownershipExchangeMethod" type="xs:string" />
+                <xs:element name="ownershipExchangeNote" type="xs:string" />
+                <xs:element name="ownershipExchangePriceDenomination" type="xs:string" />
+                <xs:element name="ownershipExchangePriceValue" type="xs:string" />
+                <xs:element name="ownershipPlace" type="xs:string" />
+                <xs:element name="usage" type="xs:string" />
+                <xs:element name="usageNote" type="xs:string" />
+
+                <!-- Object Owner's Contribution Information -->
+                <xs:element name="ownersPersonalExperience" type="xs:string" />
+                <xs:element name="ownersPersonalResponse" type="xs:string" />
+                <xs:element name="ownersReference" type="xs:string" />
+                <xs:element name="ownersContributionNote" type="xs:string" />
+
+                <!-- Object Viewers Contribution Information -->
+                <xs:element name="viewersRole" type="xs:string" />
+                <xs:element name="viewersPersonalExperience" type="xs:string" />
+                <xs:element name="viewersPersonalResponse" type="xs:string" />
+                <xs:element name="viewersReference" type="xs:string" />
+                <xs:element name="viewersContributionNote" type="xs:string" />
+
+                <!-- Reference Information -->
+                <xs:element name="reference" type="xs:string" />
+                <xs:element name="catalogNumber" type="xs:string" />
+
+                <!-- Object Collection Information -->
+                <xs:element name="fieldCollectionEventName" type="xs:string" />
                                
-                <!-- Object description Date information -->
+                <!-- Object Description Date Information -->
+                <!-- This appears to be a placeholder structured date -->
                 <xs:element name="dateAssociation" type="xs:string" />
                 <xs:element name="dateEarliestSingle" type="xs:string" />
                 <xs:element name="dateEarliestSingleCertainty" type="xs:string" />
@@ -170,6 +238,12 @@
             <xs:element name="responsibleDepartment" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
+
+    <xs:complexType name="briefDescriptionList">
+        <xs:sequence>
+            <xs:element name="briefDescription" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+    </xs:complexType>
     
     <!-- This is the base class for paginated lists -->
     <xs:complexType name="abstractCommonList">