CSPACE-4486,CSPACE-4589: Made Inscription Content (aka Textual Inscription) and Inscr...

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/AuthRefsCollObj.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/AuthRefsCollObj.xml
index 04c7259b9f291483dba08e9267b294b9043e65b8..b017bdc5b44f4b8b0ec8f4bd7c8477f9c8aa81c0 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/AuthRefsCollObj.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/AuthRefsCollObj.xml
@@ -26,6 +26,10 @@
        <comments>\r
                <comment>A virtual object to check authRefs</comment>\r
        </comments>\r
-       <inscriptionDescriptionInscriber>urn:cspace:org.collectionspace.demo:personauthority:name(person):person:name(pmadry)'Penelope Madry'</inscriptionDescriptionInscriber>\r
+    <nonTextualInscriptionGroupList>\r
+        <nonTextualInscriptionGroup>\r
+            <inscriptionDescriptionInscriber>urn:cspace:org.collectionspace.demo:personauthority:name(person):person:name(pmadry)'Penelope Madry'</inscriptionDescriptionInscriber>\r
+        </nonTextualInscriptionGroup>\r
+    </nonTextualInscriptionGroup>nonTextualInscriptionGroupList>\r
 </ns2:collectionobjects_common>\r
 </document>\r

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 2fd9705b137f21d832e34a1fbef03acec59adcc0..b20aa9b9a19511b7e373c92db42686129a7427c9 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
@@ -42,29 +42,27 @@
   <copyNumber>copyNumber</copyNumber>
   <editionNumber>editionNumber</editionNumber>
   <form>form</form>
- <inscriptionContent>inscriptionContent</inscriptionContent>
-<inscriptionContentInscriber>inscriptionContentInscriber</inscriptionContentInscriber>
-<inscriptionContentDate>inscriptionContentDate</inscriptionContentDate>
-<inscriptionContentInterpretation>inscriptionContentInterpretation</inscriptionContentInterpretation>
-<inscriptionContentLanguage>inscriptionContentLanguage</inscriptionContentLanguage>
-<inscriptionContentMethod>inscriptionContentMethod</inscriptionContentMethod>
-<inscriptionContentPosition>inscriptionContentPosition</inscriptionContentPosition>
-<inscriptionContentScript>inscriptionContentScript</inscriptionContentScript>
-<inscriptionContentTranslation>inscriptionContentTranslation</inscriptionContentTranslation>
-<inscriptionContentTransliteration>inscriptionContentTransliteration</inscriptionContentTransliteration>
-<inscriptionContentType>inscriptionContentType</inscriptionContentType>  <inscriptionDescription>inscriptionDescription</inscriptionDescription>
-
-<inscriptionDescriptionInscriber>inscriptionDescriptionInscriber</inscriptionDescriptionInscriber>
-
-<inscriptionDescriptionDate>inscriptionDescriptionDate</inscriptionDescriptionDate>
-
-<inscriptionDescriptionInterpretation>inscriptionDescriptionInterpretation</inscriptionDescriptionInterpretation>
-
-<inscriptionDescriptionMethod>inscriptionDescriptionMethod</inscriptionDescriptionMethod>
-
-<inscriptionDescriptionPosition>inscriptionDescriptionPosition</inscriptionDescriptionPosition>
-
-<inscriptionDescriptionType>inscriptionDescriptionType</inscriptionDescriptionType>
+  <textualInscriptionGroupList>
+    <inscriptionContent>inscriptionContent</inscriptionContent>
+    <inscriptionContentInscriber>inscriptionContentInscriber</inscriptionContentInscriber>
+    <inscriptionContentDate>inscriptionContentDate</inscriptionContentDate>
+    <inscriptionContentInterpretation>inscriptionContentInterpretation</inscriptionContentInterpretation>
+    <inscriptionContentLanguage>inscriptionContentLanguage</inscriptionContentLanguage>
+    <inscriptionContentMethod>inscriptionContentMethod</inscriptionContentMethod>
+    <inscriptionContentPosition>inscriptionContentPosition</inscriptionContentPosition>
+    <inscriptionContentScript>inscriptionContentScript</inscriptionContentScript>
+    <inscriptionContentTranslation>inscriptionContentTranslation</inscriptionContentTranslation>
+    <inscriptionContentTransliteration>inscriptionContentTransliteration</inscriptionContentTransliteration>
+    <inscriptionContentType>inscriptionContentType</inscriptionContentType>  <inscriptionDescription>inscriptionDescription</inscriptionDescription>
+  </textualInscriptionGroupList>
+  <nonTextualInscriptionGroupList>
+    <inscriptionDescriptionInscriber>inscriptionDescriptionInscriber</inscriptionDescriptionInscriber>
+    <inscriptionDescriptionDate>inscriptionDescriptionDate</inscriptionDescriptionDate>
+    <inscriptionDescriptionInterpretation>inscriptionDescriptionInterpretation</inscriptionDescriptionInterpretation>
+    <inscriptionDescriptionMethod>inscriptionDescriptionMethod</inscriptionDescriptionMethod>
+    <inscriptionDescriptionPosition>inscriptionDescriptionPosition</inscriptionDescriptionPosition>
+    <inscriptionDescriptionType>inscriptionDescriptionType</inscriptionDescriptionType>
+  </nonTextualInscriptionGroupList>
   <material>material</material>
   <materialComponent>materialComponent</materialComponent>
   <materialComponentNote>materialComponentNote</materialComponentNote>

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 feeb2023239a8172344260f43ed5e852a03f2d79..8ccbf8422ad39a361ca88f66119d8efe35fad040 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
@@ -150,33 +150,54 @@
     </xs:element>\r
 \r
     <!-- Object description Inscription - Content Information -->\r
+    <xs:element name="textualInscriptionGroupList" type="textualInscriptionGroupList"/>\r
+    <xs:complexType name="textualInscriptionGroupList">\r
+        <xs:sequence>\r
+            <xs:element name="textualInscriptionGroup" type="textualInscriptionGroup" minOccurs="0"\r
+                maxOccurs="unbounded"/>\r
+        </xs:sequence>\r
+    </xs:complexType>\r
 \r
     <!-- FIXME Consider whether changes to field names below are required -->\r
     <!-- in response to the renaming of this group to Textual inscription -->\r
-    <xs:element name="inscriptionContent" type="xs:string"/>\r
-    <xs:element name="inscriptionContentInscriber" type="xs:string"/>\r
-    <xs:element name="inscriptionContentDate" type="xs:string"/>\r
-    <xs:element name="inscriptionContentInterpretation" type="xs:string"/>\r
-    <xs:element name="inscriptionContentLanguage" type="xs:string"/>\r
-    <xs:element name="inscriptionContentMethod" type="xs:string"/>\r
-    <xs:element name="inscriptionContentPosition" type="xs:string"/>\r
-    <xs:element name="inscriptionContentScript" type="xs:string"/>\r
-    <xs:element name="inscriptionContentTranslation" type="xs:string"/>\r
-    <xs:element name="inscriptionContentTransliteration" type="xs:string"/>\r
-    <xs:element name="inscriptionContentType" type="xs:string"/>\r
+    <xs:complexType name="textualInscriptionGroup">\r
+        <xs:sequence>\r
+            <xs:element name="inscriptionContent" type="xs:string"/>\r
+            <xs:element name="inscriptionContentInscriber" type="xs:string"/>\r
+            <xs:element name="inscriptionContentDate" type="xs:string"/>\r
+            <xs:element name="inscriptionContentInterpretation" type="xs:string"/>\r
+            <xs:element name="inscriptionContentLanguage" type="xs:string"/>\r
+            <xs:element name="inscriptionContentMethod" type="xs:string"/>\r
+            <xs:element name="inscriptionContentPosition" type="xs:string"/>\r
+            <xs:element name="inscriptionContentScript" type="xs:string"/>\r
+            <xs:element name="inscriptionContentTranslation" type="xs:string"/>\r
+            <xs:element name="inscriptionContentTransliteration" type="xs:string"/>\r
+            <xs:element name="inscriptionContentType" type="xs:string"/>\r
+        </xs:sequence>\r
+    </xs:complexType>\r
 \r
     <!-- Object Description Inscription - Description Information -->\r
+    <xs:element name="nonTextualInscriptionGroupList" type="nonTextualInscriptionGroupList"/>\r
+    <xs:complexType name="nonTextualInscriptionGroupList">\r
+        <xs:sequence>\r
+            <xs:element name="nonTextualInscriptionGroup" type="nonTextualInscriptionGroup" minOccurs="0"\r
+                maxOccurs="unbounded"/>\r
+        </xs:sequence>\r
+    </xs:complexType>\r
 \r
     <!-- FIXME Consider whether changes to field names below are required -->\r
     <!-- in response to the renaming of this group to Non-textual inscription -->\r
-    <xs:element name="inscriptionDescription" type="xs:string"/>\r
-    <xs:element name="inscriptionDescriptionInscriber" type="xs:string"/>\r
-    <xs:element name="inscriptionDescriptionDate" type="xs:string"/>\r
-    <xs:element name="inscriptionDescriptionInterpretation" type="xs:string"/>\r
-    <xs:element name="inscriptionDescriptionMethod" type="xs:string"/>\r
-    <xs:element name="inscriptionDescriptionPosition" type="xs:string"/>\r
-    <xs:element name="inscriptionDescriptionType" type="xs:string"/>\r
-\r
+    <xs:complexType name="nonTextualInscriptionGroup">\r
+        <xs:sequence>\r
+            <xs:element name="inscriptionDescription" type="xs:string"/>\r
+            <xs:element name="inscriptionDescriptionInscriber" type="xs:string"/>\r
+            <xs:element name="inscriptionDescriptionDate" type="xs:string"/>\r
+            <xs:element name="inscriptionDescriptionInterpretation" type="xs:string"/>\r
+            <xs:element name="inscriptionDescriptionMethod" type="xs:string"/>\r
+            <xs:element name="inscriptionDescriptionPosition" type="xs:string"/>\r
+            <xs:element name="inscriptionDescriptionType" type="xs:string"/>\r
+        </xs:sequence>\r
+    </xs:complexType>\r
     <!-- Object Description Material Information -->\r
 \r
     <xs:element name="materialGroupList" type="materialGroupList"/>\r

diff --git a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java
index 679a39bd60f480693bc4c363df9bffc89688d6f7..475208f96a1e0ee6adce5c3f1e86be0b98214388 100644 (file)
--- a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java
+++ b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java
@@ -458,7 +458,6 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
             "Expected " + NUM_AUTH_REFS_EXPECTED + ", found " + numAuthRefsFound);
                
         // Check a sample of one or more person authority ref fields
-        // Assert.assertEquals(collectionObject.getInscriptionContentInscriber(), contentInscriberRefName);
         // Assert.assertEquals(collectionObject.getAssocPersons().getAssocPerson().get(0), assocPersonRefName);
         Assert.assertEquals(collectionObject.getOwners().getOwner().get(0), ownerRefName);
         Assert.assertEquals(collectionObject.getFieldCollectionSources().getFieldCollectionSource().get(0), fieldCollectionSourceRefName);

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index 08d00c9fb5c979644e882e7c7169d2edebab569e..634883d39c6483e347765f12122d0311f8b18373 100644 (file)
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -83,32 +83,10 @@
                 <xs:element name="forms" type="formList"/>
 
                 <!-- Object description Inscription - Content Information -->
+                <xs:element name="textualInscriptionGroupList" type="textualInscriptionGroupList"/>
 
-                <!-- FIXME Consider whether changes to field names below are required -->
-                <!-- in response to the renaming of this group to Textual inscription -->
-                <xs:element name="inscriptionContent" type="xs:string"/>
-                <xs:element name="inscriptionContentInscriber" type="xs:string"/>
-                <xs:element name="inscriptionContentDate" type="xs:string"/>
-                <xs:element name="inscriptionContentInterpretation" type="xs:string"/>
-                <xs:element name="inscriptionContentLanguage" type="xs:string"/>
-                <xs:element name="inscriptionContentMethod" type="xs:string"/>
-                <xs:element name="inscriptionContentPosition" type="xs:string"/>
-                <xs:element name="inscriptionContentScript" type="xs:string"/>
-                <xs:element name="inscriptionContentTranslation" type="xs:string"/>
-                <xs:element name="inscriptionContentTransliteration" type="xs:string"/>
-                <xs:element name="inscriptionContentType" type="xs:string"/>
-                
                 <!-- Object Description Inscription - Description Information -->
-
-                <!-- FIXME Consider whether changes to field names below are required -->
-                <!-- in response to the renaming of this group to Non-textual inscription -->
-                <xs:element name="inscriptionDescription" type="xs:string"/>
-                <xs:element name="inscriptionDescriptionInscriber" type="xs:string"/>
-                <xs:element name="inscriptionDescriptionDate" type="xs:string"/>
-                <xs:element name="inscriptionDescriptionInterpretation" type="xs:string"/>
-                <xs:element name="inscriptionDescriptionMethod" type="xs:string"/>
-                <xs:element name="inscriptionDescriptionPosition" type="xs:string"/>
-                <xs:element name="inscriptionDescriptionType" type="xs:string"/>
+                <xs:element name="nonTextualInscriptionGroupList" type="nonTextualInscriptionGroupList"/>
 
                 <!-- Object Description Material Information -->
                 <xs:element name="materialGroupList" type="materialGroupList"/>
@@ -409,6 +387,54 @@
             <xs:element name="valueQualifier" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>
+    
+    <!-- Object description Inscription - Content Information -->
+    <xs:complexType name="textualInscriptionGroupList">
+            <xs:sequence>
+                <xs:element name="textualInscriptionGroup" type="textualInscriptionGroup" minOccurs="0"
+                    maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+
+    <!-- FIXME Consider whether changes to field names below are required -->
+    <!-- in response to the renaming of this group to Textual inscription -->
+    <xs:complexType name="textualInscriptionGroup">
+        <xs:sequence>
+            <xs:element name="inscriptionContent" type="xs:string"/>
+            <xs:element name="inscriptionContentInscriber" type="xs:string"/>
+            <xs:element name="inscriptionContentDate" type="xs:string"/>
+            <xs:element name="inscriptionContentInterpretation" type="xs:string"/>
+            <xs:element name="inscriptionContentLanguage" type="xs:string"/>
+            <xs:element name="inscriptionContentMethod" type="xs:string"/>
+            <xs:element name="inscriptionContentPosition" type="xs:string"/>
+            <xs:element name="inscriptionContentScript" type="xs:string"/>
+            <xs:element name="inscriptionContentTranslation" type="xs:string"/>
+            <xs:element name="inscriptionContentTransliteration" type="xs:string"/>
+            <xs:element name="inscriptionContentType" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <!-- Object Description Inscription - Description Information -->
+    <xs:complexType name="nonTextualInscriptionGroupList">
+        <xs:sequence>
+            <xs:element name="nonTextualInscriptionGroup" type="nonTextualInscriptionGroup" minOccurs="0"
+                maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <!-- FIXME Consider whether changes to field names below are required -->
+    <!-- in response to the renaming of this group to Non-textual inscription -->
+    <xs:complexType name="nonTextualInscriptionGroup">
+        <xs:sequence>
+            <xs:element name="inscriptionDescription" type="xs:string"/>
+            <xs:element name="inscriptionDescriptionInscriber" type="xs:string"/>
+            <xs:element name="inscriptionDescriptionDate" type="xs:string"/>
+            <xs:element name="inscriptionDescriptionInterpretation" type="xs:string"/>
+            <xs:element name="inscriptionDescriptionMethod" type="xs:string"/>
+            <xs:element name="inscriptionDescriptionPosition" type="xs:string"/>
+            <xs:element name="inscriptionDescriptionType" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
 
     <xs:complexType name="formList">
         <xs:sequence>

diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
index f2baa639328d0006be4bc48ab997c2f5fb333c7d..b3cef545f65f389548f35408cc6c03f4bf234582 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
@@ -219,6 +219,22 @@
               <types:key>authRef</types:key>
                                                        <types:value>materialGroupList/*/materialSource</types:value>
             </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+                                                       <types:value>textualInscriptionGroupList/*/inscriptionContentInscriber</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+                                                       <types:value>textualInscriptionGroupList/*/inscriptionContentMethod</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+                                                       <types:value>nonTextualInscriptionGroupList/*/inscriptionDescriptionInscriber</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+                                                       <types:value>nonTextualInscriptionGroupList/*/inscriptionDescriptionMethod</types:value>
+            </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>authRef</types:key>
                                                        <types:value>objectComponentGroupList/*/objectComponentName</types:value>
@@ -279,27 +295,7 @@
               <types:key>authRef</types:key>
                                                        <types:value>referenceGroupList/*/reference</types:value>
             </types:item>
-            <!-- The following fields will become part of a repeatable group, per CSPACE-4486. -->
-            <!-- As a result, they will fall into complexType structures. -->
-            <!-- The names of ancestor elements below are anticipated, arbitrary and subject to change. -->
-            <!--
-            <types:item xmlns:types="http://collectionspace.org/services/common/types">
-              <types:key>authRef</types:key>
-                                                       <types:value>inscriptionContentGroupList/*/inscriptionContentInscriber</types:value>
-            </types:item>
-            <types:item xmlns:types="http://collectionspace.org/services/common/types">
-              <types:key>authRef</types:key>
-                                                       <types:value>inscriptionContentGroupList/*/inscriptionContentMethod</types:value>
-            </types:item>
-            <types:item xmlns:types="http://collectionspace.org/services/common/types">
-              <types:key>authRef</types:key>
-                                                       <types:value>inscriptionDescriptionGroupList/*/inscriptionDescriptionInscriber</types:value>
-            </types:item>
-            <types:item xmlns:types="http://collectionspace.org/services/common/types">
-              <types:key>authRef</types:key>
-                                                       <types:value>inscriptionDescriptionGroupList/*/inscriptionDescriptionMethod</types:value>
-            </types:item>
-            -->
+
             <!-- NEEDS ATTENTION - thsi is no longer correct w.r.t. schema
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>authRef</types:key>
@@ -406,7 +402,7 @@
               <types:key>termRef</types:key>
                                                        <types:value>objectNameList/*/objectNameType</types:value>
             </types:item>
-           <types:item xmlns:types="http://collectionspace.org/services/common/types">
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
                                                        <types:value>objectNameList/*/objectNameLanguage</types:value>
             </types:item>
@@ -414,6 +410,10 @@
               <types:key>termRef</types:key>
                                                        <types:value>titleGroupList/*/titleLanguage</types:value>
             </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>termRef</types:key>
+                                                       <types:value>titleGroupList/*/titleTranslationLanguage</types:value>
+            </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
                                                        <types:value>contentObjectGroupList/*/contentObjectType</types:value>
@@ -428,88 +428,77 @@
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>technicalAttributeGroupList/*/technicalAttribute</types:value>
+                                                       <types:value>textualInscriptionGroupList/*/inscriptionContentLanguage</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>technicalAttributeGroupList/*/technicalAttributeMeasurement</types:value>
+                                                       <types:value>textualInscriptionGroupList/*/inscriptionContentPosition</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>technicalAttributeGroupList/*/technicalAttributeMeasurementUnit</types:value>
+                                                       <types:value>textualInscriptionGroupList/*/inscriptionContentScript</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>assocObjectGroupList/*/assocObject</types:value>
+                                                       <types:value>textualInscriptionGroupList/*/inscriptionContentType</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>assocObjectGroupList/*/assocObjectType</types:value>
+                                                       <types:value>nonTextualInscriptionGroupList/*/inscriptionDescriptionLanguage</types:value>
             </types:item>
-            -->
-            <!-- The following field will become part of a repeatable sub-group, per CSPACE-3627. -->
-            <!-- As a result, its parent field/hiearchical path will change from that below. -->
-            <!--
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>titleGroupList/*/titleTranslationLanguage</types:value>
+                                                       <types:value>nonTextualInscriptionGroupList/*/inscriptionDescriptionPosition</types:value>
             </types:item>
-            -->
-            <!-- The following fields will become part of a repeatable sub-group, per CSPACE-3686. -->
-            <!-- As a result, their parent field/hiearchical paths will change from those below. -->
-            <!--
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>dimensionList/*/dimension</types:value>
+                                                       <types:value>nonTextualInscriptionGroupList/*/inscriptionDescriptionType</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>dimensionList/*/measurementUnit</types:value>
-            </types:item>
-            <types:item xmlns:types="http://collectionspace.org/services/common/types">
-              <types:key>termRef</types:key>
-                                                       <types:value>dimensionList/*/measurementMethod</types:value>
+                                                       <types:value>technicalAttributeGroupList/*/technicalAttribute</types:value>
             </types:item>
-            -->
-            <!-- The following fields will become part of a repeatable group, per CSPACE-4486. -->
-            <!-- As a result, they will fall into complexType structures. -->
-            <!-- The names of ancestor elements below are anticipated, arbitrary and subject to change. -->
-            <!--
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>inscriptionContentGroupList/*/inscriptionContentLanguage</types:value>
+                                                       <types:value>technicalAttributeGroupList/*/technicalAttributeMeasurement</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>inscriptionContentGroupList/*/inscriptionContentPosition</types:value>
+                                                       <types:value>technicalAttributeGroupList/*/technicalAttributeMeasurementUnit</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>inscriptionContentGroupList/*/inscriptionContentScript</types:value>
+                                                       <types:value>assocObjectGroupList/*/assocObject</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>inscriptionContentGroupList/*/inscriptionContentType</types:value>
+                                                       <types:value>assocObjectGroupList/*/assocObjectType</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>inscriptionDescriptionGroupList/*/inscriptionDescriptionLanguage</types:value>
+                                                       <types:value>usageGroupList/*/usage</types:value>
             </types:item>
+            -->
+            
+            <!-- The following fields have become part of a repeatable sub-group, per CSPACE-3686. -->
+            <!-- Their parent field/hiearchical paths have changedfrom those below. -->
+            <!--
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>inscriptionDescriptionGroupList/*/inscriptionDescriptionPosition</types:value>
+                                                       <types:value>dimensionList/*/dimension</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>inscriptionDescriptionGroupList/*/inscriptionDescriptionType</types:value>
+                                                       <types:value>dimensionList/*/measurementUnit</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                                                       <types:value>usageGroupList/*/usage</types:value>
+                                                       <types:value>dimensionList/*/measurementMethod</types:value>
             </types:item>
             -->
-            <!-- The following fields may become part of a repeatable sub-group, per JIRA(s) -->
-            <!-- spawned from CSPACE-4490. -->
+            
+            <!-- The following fields related to Associated Event and Owner may become  -->
+            <!-- part of a repeatable sub-group, per JIRA(s) spawned from CSPACE-4490. -->
             <!-- As a result, they will fall into complexType structures. -->
             <!-- The names of ancestor elements below are anticipated, arbitrary and subject to change. -->
             <!--
@@ -522,15 +511,15 @@
                                                        <types:value>assocEventGroupList/*/assocEventNameType</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
-              <types:key>authRef</types:key>
+              <types:key>termRef</types:key>
                                                        <types:value>ownerGroupList/*/ownershipAccess</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
-              <types:key>authRef</types:key>
+              <types:key>termRef</types:key>
                                                        <types:value>ownerGroupList/*/ownershipCategory</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
-              <types:key>authRef</types:key>
+              <types:key>termRef</types:key>
                                                        <types:value>ownerGroupList/*/ownershipExchangeMethod</types:value>
             </types:item>
             -->

diff --git a/services/imports/service/src/test/resources/requests/collectionobject-request.xml b/services/imports/service/src/test/resources/requests/collectionobject-request.xml
index 6022796c6d9ed417a1ebe57bd364f9dd02ec896d..197fde81e50bc8b4f993249787d6b0bf5b3ec46f 100755 (executable)
--- a/services/imports/service/src/test/resources/requests/collectionobject-request.xml
+++ b/services/imports/service/src/test/resources/requests/collectionobject-request.xml
@@ -8,7 +8,32 @@
             <collectionobjects_common:assocEventNameType></collectionobjects_common:assocEventNameType>\r
             <collectionobjects_common:ownershipCategory>public</collectionobjects_common:ownershipCategory>\r
             <collectionobjects_common:objectProductionReasons/>\r
-            <collectionobjects_common:inscriptionDescriptionMethod></collectionobjects_common:inscriptionDescriptionMethod>\r
+            <textualInscriptionGroupList>\r
+                <textualInscriptionGroup>\r
+                    <collectionobjects_common:inscriptionContentScript>gothic-script</collectionobjects_common:inscriptionContentScript>\r
+                    <collectionobjects_common:inscriptionContentInscriber>urn:cspace:org.collectionspace.demo:orgauthority:name(organization):organization:name(screenmagicinc.)'Screen+Magic+Inc.'</collectionobjects_common:inscriptionContentInscriber>\r
+                    <collectionobjects_common:inscriptionContentTranslation>No, it's true, I'm not a baguette</collectionobjects_common:inscriptionContentTranslation>\r
+                    <collectionobjects_common:inscriptionContentType>label</collectionobjects_common:inscriptionContentType>\r
+                    <collectionobjects_common:inscriptionContentTransliteration>I'm a vegetarian</collectionobjects_common:inscriptionContentTransliteration>\r
+                    <collectionobjects_common:inscriptionContentDate></collectionobjects_common:inscriptionContentDate>\r
+                    <collectionobjects_common:inscriptionContent>Non, c'est vrai! Je ne suis pas une baguette</collectionobjects_common:inscriptionContent>\r
+                    <inscriptionContentInterpretation>It could mean a lot of things, but oddly no connection to ogres</inscriptionContentInterpretation>\r
+                    <collectionobjects_common:inscriptionContentLanguage>arabic</collectionobjects_common:inscriptionContentLanguage>\r
+                    <collectionobjects_common:inscriptionContentPosition>base</collectionobjects_common:inscriptionContentPosition>\r
+                    <collectionobjects_common:inscriptionContentMethod></collectionobjects_common:inscriptionContentMethod>\r
+               </textualInscriptionGroup>\r
+            </textualInscriptionGroupList>\r
+            <nonTextualInscriptionGroupList>\r
+                <nonTextualInscriptionGroup>\r
+                    <collectionobjects_common:inscriptionDescriptionDate></collectionobjects_common:inscriptionDescriptionDate>\r
+                    <collectionobjects_common:inscriptionDescriptionType>decoration</collectionobjects_common:inscriptionDescriptionType>\r
+                    <collectionobjects_common:inscriptionDescriptionPosition>bottom</collectionobjects_common:inscriptionDescriptionPosition>\r
+                    <collectionobjects_common:inscriptionDescriptionInscriber>urn:cspace:org.collectionspace.demo:personauthority:name(person):person:name(reginabadet)'Regina+Badet'</collectionobjects_common:inscriptionDescriptionInscriber>\r
+                    <inscriptionDescriptionMethod></inscriptionDescriptionMethod>\r
+                    <inscriptionDescriptionInterpretation>No Idea</inscriptionDescriptionInterpretation>\r
+                    <inscriptionDescription>Big symbol at the base</inscriptionDescription>\r
+                </nonTextualInscriptionGroup>\r
+            </nonTextualInscriptionGroupList>\r
             <collectionobjects_common:fieldCollectionNote></collectionobjects_common:fieldCollectionNote>\r
             <collectionobjects_common:contentObjectGroupList>\r
               <contentObjectGroup>\r
@@ -19,7 +44,6 @@
             <collectionobjects_common:assocEventPersons>\r
               <assocEventPerson>urn:cspace:org.collectionspace.demo:personauthority:name(person):person:name(maryannecasseta)'Mary+Anne+Cassata'</assocEventPerson>\r
             </collectionobjects_common:assocEventPersons>\r
-            <collectionobjects_common:inscriptionDescription>Big symbol at the base</collectionobjects_common:inscriptionDescription>\r
             <collectionobjects_common:dateEarliestSingleQualifier/>\r
             <collectionobjects_common:technicalAttributeGroupList>\r
               <technicalAttributeGroup>\r
@@ -28,11 +52,9 @@
                 <technicalAttributeMeasurementUnit>rpm</technicalAttributeMeasurementUnit>\r
               </technicalAttributeGroup>\r
             </collectionobjects_common:technicalAttributeGroupList>\r
-            <collectionobjects_common:inscriptionDescriptionInterpretation>No Idea</collectionobjects_common:inscriptionDescriptionInterpretation>\r
             <collectionobjects_common:dateText/>\r
             <collectionobjects_common:ownershipDates></collectionobjects_common:ownershipDates>\r
             <collectionobjects_common:dimensionSummary/>\r
-            <collectionobjects_common:inscriptionContentInterpretation>It could mean a lot of things, but oddly no connection to ogres</collectionobjects_common:inscriptionContentInterpretation>\r
             <collectionobjects_common:objectProductionOrganizationGroupList>\r
               <objectProductionOrganizationGroup>\r
                 <objectProductionOrganizationRole></objectProductionOrganizationRole>\r
@@ -76,7 +98,6 @@
               <briefDescription>Or it could be a petrified tree looking slightly like an ogre</briefDescription>\r
               <briefDescription>Or just a rock, looking a lot like a petrified tree</briefDescription>\r
             </collectionobjects_common:briefDescriptions>\r
-            <collectionobjects_common:inscriptionContentLanguage>arabic</collectionobjects_common:inscriptionContentLanguage>\r
             <collectionobjects_common:colors>\r
               <color></color>\r
             </collectionobjects_common:colors>\r
@@ -85,7 +106,6 @@
             </collectionobjects_common:fieldCollectors>\r
             <collectionobjects_common:ownersPersonalExperience>These object records are tedious to fill out</collectionobjects_common:ownersPersonalExperience>\r
             <collectionobjects_common:contentDescription>Content of a piece of rock?! .. well there might be diamonds and petrified fish in it</collectionobjects_common:contentDescription>\r
-            <collectionobjects_common:inscriptionDescriptionInscriber>urn:cspace:org.collectionspace.demo:personauthority:name(person):person:name(reginabadet)'Regina+Badet'</collectionobjects_common:inscriptionDescriptionInscriber>\r
             <collectionobjects_common:objectProductionPeopleGroupList>\r
               <objectProductionPeopleGroup>\r
                 <objectProductionPeople></objectProductionPeople>\r
@@ -117,8 +137,6 @@
             <collectionobjects_common:forms>\r
               <form></form>\r
             </collectionobjects_common:forms>\r
-            <collectionobjects_common:inscriptionContentDate></collectionobjects_common:inscriptionContentDate>\r
-            <collectionobjects_common:inscriptionContent>Non, c'est vrai! Je ne suis pas une baguette</collectionobjects_common:inscriptionContent>\r
             <collectionobjects_common:assocPeopleGroupList/>\r
             <collectionobjects_common:dateEarliestSingle/>\r
             <collectionobjects_common:ownershipExchangeNote>none</collectionobjects_common:ownershipExchangeNote>\r
@@ -126,13 +144,8 @@
             <collectionobjects_common:assocEventOrganizations>\r
               <assocEventOrganization>urn:cspace:org.collectionspace.demo:orgauthority:name(organization):organization:name(7-eleven)'7-Eleven'</assocEventOrganization>\r
             </collectionobjects_common:assocEventOrganizations>\r
-            <collectionobjects_common:inscriptionContentType>label</collectionobjects_common:inscriptionContentType>\r
-            <collectionobjects_common:inscriptionContentTransliteration>I'm a vegetarian</collectionobjects_common:inscriptionContentTransliteration>\r
             <collectionobjects_common:objectNumber>CompleteObject001</collectionobjects_common:objectNumber>\r
-            <collectionobjects_common:inscriptionDescriptionPosition>bottom</collectionobjects_common:inscriptionDescriptionPosition>\r
-            <collectionobjects_common:inscriptionContentTranslation>No, it's true, I'm not a baguette</collectionobjects_common:inscriptionContentTranslation>\r
             <collectionobjects_common:dateAssociation/>\r
-            <collectionobjects_common:inscriptionDescriptionType>decoration</collectionobjects_common:inscriptionDescriptionType>\r
             <collectionobjects_common:dimensionMeasurementUnit/>\r
             <collectionobjects_common:contentScripts>\r
               <contentScript></contentScript>\r
@@ -151,7 +164,6 @@
             <collectionobjects_common:fieldColEventNames>\r
               <fieldColEventName>fieldCollectionEventName</fieldColEventName>\r
             </collectionobjects_common:fieldColEventNames>\r
-            <collectionobjects_common:inscriptionContentInscriber>urn:cspace:org.collectionspace.demo:orgauthority:name(organization):organization:name(screenmagicinc.)'Screen+Magic+Inc.'</collectionobjects_common:inscriptionContentInscriber>\r
             <collectionobjects_common:contentPersons>\r
               <contentPerson>urn:cspace:org.collectionspace.demo:personauthority:name(person):person:name(gingerrogers)'Ginger+Rogers'</contentPerson>\r
             </collectionobjects_common:contentPersons>\r
@@ -174,7 +186,6 @@
                 <titleLanguage>swahili</titleLanguage>\r
               </titleGroup>\r
             </collectionobjects_common:titleGroupList>\r
-            <collectionobjects_common:inscriptionContentPosition>base</collectionobjects_common:inscriptionContentPosition>\r
             <collectionobjects_common:assocPersonGroupList/>\r
             <collectionobjects_common:assocOrganizationGroupList/>\r
             <collectionobjects_common:viewersPersonalExperience>Probably a horrible one, considering how uninteresting this object is</collectionobjects_common:viewersPersonalExperience>\r
@@ -202,7 +213,6 @@
             <collectionobjects_common:dimensionValueDate/>\r
             <collectionobjects_common:ownersReferences/>\r
             <collectionobjects_common:otherNumberList/>\r
-            <collectionobjects_common:inscriptionContentMethod></collectionobjects_common:inscriptionContentMethod>\r
             <collectionobjects_common:fieldCollectionPlace></collectionobjects_common:fieldCollectionPlace>\r
             <collectionobjects_common:viewersContributionNote>You got the basic details down - it was horrible, what else can I say</collectionobjects_common:viewersContributionNote>\r
             <collectionobjects_common:fieldCollectionMethods>\r
@@ -238,7 +248,6 @@
                 <techniqueType></techniqueType>\r
               </techniqueGroup>\r
             </collectionobjects_common:techniqueGroupList>\r
-            <collectionobjects_common:inscriptionDescriptionDate></collectionobjects_common:inscriptionDescriptionDate>\r
             <collectionobjects_common:assocConceptGroupList/>\r
             <collectionobjects_common:contentPeoples>\r
               <contentPeople></contentPeople>\r
@@ -252,7 +261,6 @@
             <collectionobjects_common:fieldCollectionSources>\r
               <fieldCollectionSource></fieldCollectionSource>\r
             </collectionobjects_common:fieldCollectionSources>\r
-            <collectionobjects_common:inscriptionContentScript>gothic-script</collectionobjects_common:inscriptionContentScript>\r
             <collectionobjects_common:sex>female</collectionobjects_common:sex>\r
             <collectionobjects_common:materialGroupList>\r
               <materialGroup>\r