CSPACE-3224: Updated lists of fields that will be configured to hold large amounts...

diff --git a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml
index 0589203c833aaa79401160811c524d8df6e228ef..f99ba2f4f0744591e09ec7ba6e215d7088258668 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml
+++ b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml
@@ -18,19 +18,25 @@
           <!-- * -->
           
           <!-- =========================================================== -->
-          <!-- Acquisition fields -->
+          <!-- Acquisition -->
           <!-- =========================================================== -->
-          
+
+          <field type="largetext">acquisitionFundingSourceProvisos</field>
           <field type="largetext">acquisitions_common:acquisitionNote</field>
           <field type="largetext">acquisitions_common:acquisitionProvisos</field>
           <field type="largetext">acquisitions_common:acquisitionReason</field>
+          <field type="largetext">acquisitions_common:creditLine</field>
+
           
-          <!-- Add in 1.1 per CSPACE-2769 -->
-          <!-- field type="largetext">acquisitions_common:creditLine</field -->
-          
+          <!-- =========================================================== -->
+          <!-- Blob -->
+          <!-- =========================================================== -->
+
+          <!-- No largetext fields identified to date -->
+
 
           <!-- =========================================================== -->
-          <!-- CollectionObject / Cataloging fields -->
+          <!-- CollectionObject / Cataloging -->
           <!-- =========================================================== -->
           
           <!-- Object Identification Information -->
@@ -242,13 +248,13 @@
 
 
           <!-- =========================================================== -->
-          <!-- Contact fields -->
+          <!-- Contact -->
           <!-- =========================================================== -->
           <field type="largetext">contacts_common:addressPlace</field>
           
 
           <!-- =========================================================== -->
-          <!-- Intake fields -->
+          <!-- Intake -->
           <!-- =========================================================== -->
           
           <field type="largetext">intakes_common:entryNote</field>
@@ -263,7 +269,7 @@
 
 
           <!-- =========================================================== -->
-          <!-- Loan In fields -->
+          <!-- Loan In -->
           <!-- =========================================================== -->
           
           <field type="largetext">loansin_common:loanInConditions</field>
@@ -271,56 +277,78 @@
  
  
           <!-- =========================================================== -->
-          <!-- Loan Out fields -->
+          <!-- Loan Out -->
           <!-- =========================================================== -->
           
           <field type="largetext">loansout_common:specialConditionsOfLoan</field>
           <field type="largetext">loansout_common:loanOutNote</field>      
- 
+          <field type="largetext">loansout_common:loanPurpose</field>
+          <field type="largetext">loanedObjectStatusNote</field>
+
  
           <!-- =========================================================== -->
-          <!-- Movement fields -->
+          <!-- Movement / Location and Movement Control -->
           <!-- =========================================================== -->
           
           <field type="largetext">movements_common:currentLocationNote</field>
           <field type="largetext">movements_common:movementNote</field>
-          
-                   
+
+
           <!-- =========================================================== -->
-          <!-- Object Exit fields -->
+          <!-- Media / Media Handling -->
           <!-- =========================================================== -->
-          
-          <!-- Note: schema name 'objectexit_common' is currently -->
-          <!-- intentionally singular -->
 
+          <field type="largetext">media_common:copyrightStatement</field>
+          <field type="largetext">media_common:description</field>
+          <field type="largetext">media_common:title</field>
+
+
+          <!-- =========================================================== -->
+          <!-- Note -->
+          <!-- =========================================================== -->
+
+          <field type="largetext">notes_common:content</field>
+
+
+          <!-- =========================================================== -->
+          <!-- Object Exit -->
+          <!-- =========================================================== -->
+          
           <field type="largetext">objectexit_common:exitNote</field>
           <field type="largetext">objectexit_common:packingNote</field>
 
 
           <!-- =========================================================== -->
-          <!-- Organization fields -->
+          <!-- Organization -->
           <!-- =========================================================== -->
           
-          <field type="largetext">organizations_common:shortName</field>
-          <field type="largetext">organizations_common:longName</field>
-          <field type="largetext">organizations_common:nameAdditions</field>
-          
-          <!-- FIXME: multivalued field - need to verify schema and field name -->
-          <field type="largetext">organizations_common:historyNotes</field>
+          <field type="largetext">shortName</field>
+          <field type="largetext">longName</field>
+          <field type="largetext">nameAdditions</field>
+          <field type="largetext">historyNote</field>
 
 
           <!-- =========================================================== -->
-          <!-- Person fields -->
+          <!-- Person -->
           <!-- =========================================================== -->
           <field type="largetext">persons_common:bioNote</field>
           <field type="largetext">persons_common:nameNote</field>
 
 
           <!-- =========================================================== -->
-          <!-- Storage Location fields -->
+          <!-- Relation -->
+          <!-- =========================================================== -->
+
+          <!-- No largetext fields identified to date -->
+
+
+          <!-- =========================================================== -->
+          <!-- Storage Location / Location -->
           <!-- =========================================================== -->
           <field type="largetext">locations_common:displayName</field>
           <field type="largetext">locations_common:name</field>
+          <!-- conditionNote will be made part of a repeatable group of fields in a future release -->
+          <field type="largetext">locations_common:conditionNote</field>
           <field type="largetext">locations_common:securityNote</field>
           <field type="largetext">locations_common:accessNote</field>
          

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd
index 05d3d2f03245ae61cd075a6f86333c54256d0fe8..741fe42ceca25dc7b671e72b23a3462a173020b5 100644 (file)
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd
@@ -64,13 +64,7 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    <xs:element name="historyNotes">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="historyNote" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
+    <xs:element name="historyNotes" type="historyNotes"/>
 
     <xs:complexType name="mainBodyGroupList">
         <xs:sequence>
@@ -86,5 +80,11 @@
         </xs:sequence>
     </xs:complexType>
 
+    <xs:complexType name="historyNotes">
+        <xs:sequence>
+            <xs:element name="historyNote" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
 </xs:schema>