CSPACE-4457,CSPACE-4472: Reviewed and updated the list of fields, in the Object Descr...

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 3f3e15214839807bb98bc718bb51851c24efaed8..65898535ecaf11f455e8cfac9b700263d272a32a 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
@@ -130,6 +130,57 @@
         </service:part>
         <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="collectionobjects_common" updated="" order="1">
           <service:properties>
+            <!-- Concept authority -->
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+              <types:value>contentActivities|contentActivity</types:value>
+            </types:item>
+            <!-- Concept authority -->
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+              <types:value>contentConcepts|contentConcept</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+              <types:value>contentOrganizations|contentOrganization</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+              <types:value>contentPeoples|contentPeople</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+              <types:value>contentPersons|contentPerson</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+              <types:value>contentPlaces|contentPlace</types:value>
+            </types:item>
+            <!-- Concept authority -->
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+              <types:value>styles|style</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+              <types:value>assocEventOrganizations|assocEventOrganization</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+              <types:value>assocEventPersons|assocEventPerson</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+              <types:value>owners|owner</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+              <types:value>fieldCollectionSources|fieldCollectionSource</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>authRef</types:key>
+              <types:value>fieldCollectors|fieldCollector</types:value>
+            </types:item>
             <!-- Commented out for now, as searching within a field in a complexType breaks searches. -->
             <!-- The following fields were placed into complexTypes in group repeatability work in CSPACE-2927: -->
             <!--
@@ -139,15 +190,31 @@
             </types:item>
             <types:item>
               <types:key>authRef</types:key>
-              <types:value>contentEventNameGroupList|contentEventName</types:value>
+              <types:value>contentEventNameGroupList|contentEventNameType</types:value>
+            </types:item>
+            <types:item>
+              <types:key>authRef</types:key>
+              <types:value>contentObjectGroupList|contentObjectType</types:value>
+            </types:item>
+            <types:item>
+              <types:key>authRef</types:key>
+              <types:value>contentOtherGroupList|contentOtherType</types:value>
+            </types:item>
+            <types:item>
+              <types:key>authRef</types:key>
+              <types:value>materialGroupList|material</types:value>
+            </types:item>
+             <types:item>
+              <types:key>authRef</types:key>
+              <types:value>materialGroupList|materialComponent</types:value>
             </types:item>
             <types:item>
               <types:key>authRef</types:key>
-              <types:value>inscriptionContentInscriber</types:value>
+              <types:value>materialGroupList|materialSource</types:value>
             </types:item>
             <types:item>
               <types:key>authRef</types:key>
-              <types:value>inscriptionDescriptionInscriber</types:value>
+              <types:value>objectComponentGroupList|objectComponentName</types:value>
             </types:item>
             <types:item>
               <types:key>authRef</types:key>
@@ -166,56 +233,79 @@
               <types:value>assocPersons|assocPerson</types:value>
             </types:item>
             -->
-            <!-- Concept authority -->
-            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+            <!-- 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>
               <types:key>authRef</types:key>
-              <types:value>contentActivities|contentActivity</types:value>
+              <types:value>inscriptionContentGroupList|inscriptionContentInscriber</types:value>
             </types:item>
-            <!-- Concept authority -->
-            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+            <types:item>
               <types:key>authRef</types:key>
-              <types:value>contentConcepts|contentConcept</types:value>
+              <types:value>inscriptionContentGroupList|inscriptionContentMethod</types:value>
             </types:item>
-            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+            <types:item>
               <types:key>authRef</types:key>
-              <types:value>contentOrganizations|contentOrganization</types:value>
+              <types:value>inscriptionDescriptionGroupList|inscriptionDescriptionInscriber</types:value>
             </types:item>
-            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+            <types:item>
               <types:key>authRef</types:key>
-              <types:value>contentPersons|contentPerson</types:value>
+              <types:value>inscriptionDescriptionGroupList|inscriptionDescriptionMethod</types:value>
             </types:item>
+            -->
+            <!-- The following field will become part of a repeatable sub-group, per CSPACE-3686. -->
+            <!-- As a result, its parent field/hiearchical paths will change from that shown below. -->
+            <!--
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>authRef</types:key>
-              <types:value>assocEventOrganizations|assocEventOrganization</types:value>
+              <types:value>dimensionList|measuredBy</types:value>
+            </types:item>
+            -->
+            <!-- CSPACE-4457: Identification of term list / controlled vocabulary fields -->
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>termRef</types:key>
+              <types:value>responsibleDepartment|responsibleDepartments</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
-              <types:key>authRef</types:key>
-              <types:value>assocEventPersons|assocEventPerson</types:value>
+              <types:key>termRef</types:key>
+              <types:value>collection</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
-              <types:key>authRef</types:key>
-              <types:value>owners|owner</types:value>
+              <types:key>termRef</types:key>
+              <types:value>recordStatus</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
-              <types:key>authRef</types:key>
-              <types:value>fieldCollectionSources|fieldCollectionSource</types:value>
+              <types:key>termRef</types:key>
+              <types:value>ageUnit</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
-              <types:key>authRef</types:key>
-              <types:value>fieldCollectors|fieldCollector</types:value>
+              <types:key>termRef</types:key>
+              <types:value>contentLanguages|contentLanguage</types:value>
             </types:item>
-            <!-- CSPACE-4457: Identification of term list / controlled vocabulary fields -->
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-              <types:value>responsibleDepartment|responsibleDepartments</types:value>
+              <types:value>contentPositions|contentPosition</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-              <types:value>collection</types:value>
+              <types:value>contentScripts|contentScript</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-              <types:value>recordStatus</types:value>
+              <types:value>forms|form</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>termRef</types:key>
+              <types:value>objectStatusList|objectStatus</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>termRef</types:key>
+              <types:value>phase</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>termRef</types:key>
+              <types:value>sex</types:value>
             </types:item>
             <!-- Commented out for now, as searching within a field in a complexType breaks searches -->
             <!--
@@ -247,8 +337,32 @@
               <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>contentObjectGroupList|contentObjectType</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>termRef</types:key>
+              <types:value>titleGroupList|titleType</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>termRef</types:key>
+              <types:value>dimensionList|measuredPart</types:value>
+            </types:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>termRef</types:key>
+              <types:value>technicalAttributeGroupList|technicalAttribute</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:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>termRef</types:key>
+              <types:value>technicalAttributeGroupList|technicalAttributeMeasurementUnit</types:value>
+            </types:item>
             -->
-            <!-- The following field will becomme part of a repeatable sub-group, per CSPACE-3627. -->
+            <!-- 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">
@@ -256,10 +370,53 @@
               <types:value>titleGroupList|titleTranslationLanguage</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>titleGroupList|titleType</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>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: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:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>termRef</types:key>
+              <types:value>inscriptionContentGroupList|inscriptionContentPosition</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:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>termRef</types:key>
+              <types:value>inscriptionContentGroupList|inscriptionContentType</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:item>
+            <types:item xmlns:types="http://collectionspace.org/services/common/types">
+              <types:key>termRef</types:key>
+              <types:value>inscriptionDescriptionGroupList|inscriptionDescriptionPosition</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:item>
             -->
           </service:properties>
@@ -982,6 +1139,8 @@
               <types:value>typeList|type</types:value>
             </types:item>
             <!-- The following term references all fall within a nested complexType / multivalued group of fields -->
+            <!-- The following fields will also 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>