From 89ad47fd1ef2e899802238012c9d74073392a615 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 3 May 2012 20:06:41 -0700
Subject: [PATCH] CSPACE-5120,CSPACE-4685: Updated Organization schema with
 repeatable term info group. Other changes relative to this schema change have
 *not* been done. Removed subBody repeatable group from Organization items,
 per CSPACE-4685. Fixed a stray char that found its way into the updated
 Persons common schema.

---
 .../schemas/organizations_common.xsd          | 116 ++++++++++--------
 .../main/resources/organization_common.xsd    |  45 ++++---
 .../main/resources/schemas/persons_common.xsd |   2 +-
 3 files changed, 98 insertions(+), 65 deletions(-)

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 b02a17675..283297e28 100644
--- 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
@@ -17,7 +17,7 @@
     xmlns="http://collectionspace.org/services/organization"
     targetNamespace="http://collectionspace.org/services/organization"
     version="0.1"
-    >
+>
     <!-- See http://wiki.collectionspace.org/display/collectionspace/Name+Authority+Schema -->
 <!-- See http://wiki.collectionspace.org/display/collectionspace/Organization+Service+Home -->    
 
@@ -26,68 +26,86 @@
     <xs:element name="inAuthority" type="xs:string" />
     <xs:element name="shortIdentifier" type="xs:string"/>
     <xs:element name="refName" type="xs:string"/>
-    <xs:element name="termStatus" type="xs:string"/>
-    <xs:element name="displayName" type="xs:string"/>
-    <xs:element name="displayNameComputed" type="xs:boolean"/>
-    <xs:element name="shortDisplayName" type="xs:string"/>
-    <xs:element name="shortDisplayNameComputed" type="xs:boolean"/>
+    
+    <!-- Term Information repeatable group -->
+    <xs:element name="orgTermGroupList" type="orgTermGroupList"/>
+
     <xs:element name="mainBodyGroupList" type="mainBodyGroupList"/>
-    <xs:element name="source" type="xs:string"/>
-    <xs:element name="sourcePage" type="xs:string"/>
+    
     <xs:element name="description" type="xs:string"/>
+    <xs:element name="foundingDate" type="xs:string"/>
+    <xs:element name="dissolutionDate" type="xs:string"/>
+    <xs:element name="foundingPlace" type="xs:string"/>
+    <xs:annotation>
+    
+        <xs:element name="groups">
+            <xs:complexType>
+                <xs:sequence>
+                    <xs:element name="group" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                </xs:sequence>
+            </xs:complexType>
+        </xs:element>
+    
+        <xs:element name="functions">
+            <xs:complexType>
+                <xs:sequence>
+                    <xs:element name="function" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                </xs:sequence>
+            </xs:complexType>
+        </xs:element>
+            
+        <xs:element name="contactNames">
+            <xs:complexType>
+                <xs:sequence>
+                    <xs:element name="contactName" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                </xs:sequence>
+            </xs:complexType>
+        </xs:element>
 
-    <xs:element name="contactNames">
-        <xs:complexType>
+        <xs:element name="historyNotes" type="historyNotes"/>
+
+        <xs:complexType name="mainBodyGroupList">
             <xs:sequence>
-                <xs:element name="contactName" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="mainBodyGroup" type="mainBodyGroup" minOccurs="0" maxOccurs="unbounded"/>
             </xs:sequence>
         </xs:complexType>
-    </xs:element>
-    <xs:element name="foundingDate" type="xs:string"/>
-    <xs:element name="dissolutionDate" type="xs:string"/>
-    <xs:element name="foundingPlace" type="xs:string"/>
-    <xs:element name="groups">
-        <xs:complexType>
+
+        <xs:complexType name="mainBodyGroup">
             <xs:sequence>
-                <xs:element name="group" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="longName" type="xs:string"/>
+                <xs:element name="shortName" type="xs:string"/>
+                <xs:element name="nameAdditions" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
-    </xs:element>
-    <xs:element name="functions">
-        <xs:complexType>
+
+        <xs:complexType name="historyNotes">
             <xs:sequence>
-                <xs:element name="function" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="historyNote" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
             </xs:sequence>
         </xs:complexType>
-    </xs:element>
-    <xs:element name="subBodies">
-        <xs:complexType>
+    
+        <xs:complexType name="orgTermGroupList">
             <xs:sequence>
-                <xs:element name="subBody" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="orgTermGroup" type="orgTermGroup" minOccurs="0" maxOccurs="unbounded"/>
             </xs:sequence>
         </xs:complexType>
-    </xs:element>
-    <xs:element name="historyNotes" type="historyNotes"/>
-
-    <xs:complexType name="mainBodyGroupList">
-        <xs:sequence>
-            <xs:element name="mainBodyGroup" type="mainBodyGroup" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="mainBodyGroup">
-        <xs:sequence>
-            <xs:element name="longName" type="xs:string"/>
-            <xs:element name="shortName" type="xs:string"/>
-            <xs:element name="nameAdditions" type="xs:string"/>
-        </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>
+        <xs:complexType name="orgTermGroup">
+            <xs:sequence>
+                <!-- Common across all authority item terms -->
+                <xs:element name="termDisplayName" type="xs:string"/>
+                <xs:element name="termName" type="xs:string"/>
+                <xs:element name="termType" type="xs:string"/>
+                <xs:element name="termStatus" type="xs:string"/>
+                <xs:element name="termQualifier" type="xs:string"/>
+                <xs:element name="termLanguage" type="xs:string"/>
+                <xs:element name="termPreferredForLanguage" type="xs:boolean"/>
+                <xs:element name="termSource" type="xs:string"/>
+                <xs:element name="termSourceDetail" type="xs:string"/>
+                <xs:element name="termSourceUniqueID" type="xs:string"/>
+                <!-- Specific to Organization terms -->
+            </xs:sequence>
+        </xs:complexType>
+    
+    </xs:schema>
 
diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd
index 946afd0eb..905b05d12 100644
--- a/services/organization/jaxb/src/main/resources/organization_common.xsd
+++ b/services/organization/jaxb/src/main/resources/organization_common.xsd
@@ -23,22 +23,20 @@
                 <xs:element name="inAuthority" type="xs:string" />
                 <xs:element name="shortIdentifier" type="xs:string"/>
                 <xs:element name="refName" type="xs:string"/>
-                <xs:element name="termStatus" type="xs:string"/>
-                <xs:element name="displayName" type="xs:string"/>
-                <xs:element name="displayNameComputed" type="xs:boolean"/>
-                <xs:element name="shortDisplayName" type="xs:string"/>
-                <xs:element name="shortDisplayNameComputed" type="xs:boolean"/>
-                <xs:element name="source" type="xs:string"/>
-                <xs:element name="sourcePage" type="xs:string"/>
-                <xs:element name="description" type="xs:string"/>
+                
+                <!-- Term Information repeatable group -->
+                <xs:element name="orgTermGroupList" type="orgTermGroupList"/>
+                
                 <xs:element name="mainBodyGroupList" type="mainBodyGroupList"/>
-                <xs:element name="contactNames" type="contactNameList"/>
+                
+                <xs:element name="description" type="xs:string"/>
                 <xs:element name="foundingDate" type="xs:string"/>
                 <xs:element name="dissolutionDate" type="xs:string"/>
                 <xs:element name="foundingPlace" type="xs:string"/>
+                
                 <xs:element name="groups" type="groupList"/>
                 <xs:element name="functions" type="functionList"/>
-                <xs:element name="subBodies" type="subBodyList"/>
+                <xs:element name="contactNames" type="contactNameList"/>
                 <xs:element name="historyNotes" type="historyNoteList"/>
             </xs:sequence>
         </xs:complexType>
@@ -57,7 +55,7 @@
             <xs:element name="nameAdditions" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>
-
+    
     <xs:complexType name="contactNameList">
         <xs:sequence>
             <xs:element name="contactName" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
@@ -76,15 +74,32 @@
         </xs:sequence>
     </xs:complexType>
 
-    <xs:complexType name="subBodyList">
+    <xs:complexType name="historyNoteList">
         <xs:sequence>
-            <xs:element name="subBody" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="historyNote" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    
+    <xs:complexType name="orgTermGroupList">
+        <xs:sequence>
+            <xs:element name="orgTermGroup" type="orgTermGroup" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 
-    <xs:complexType name="historyNoteList">
+    <xs:complexType name="orgTermGroup">
         <xs:sequence>
-            <xs:element name="historyNote" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            <!-- Common across all authority item terms -->
+            <xs:element name="termDisplayName" type="xs:string"/>
+            <xs:element name="termName" type="xs:string"/>
+            <xs:element name="termType" type="xs:string"/>
+            <xs:element name="termStatus" type="xs:string"/>
+            <xs:element name="termQualifier" type="xs:string"/>
+            <xs:element name="termLanguage" type="xs:string"/>
+            <xs:element name="termPreferredForLanguage" type="xs:boolean"/>
+            <xs:element name="termSource" type="xs:string"/>
+            <xs:element name="termSourceDetail" type="xs:string"/>
+            <xs:element name="termSourceUniqueID" type="xs:string"/>
+            <!-- Specific to Organization terms -->
         </xs:sequence>
     </xs:complexType>
 
diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd
index 45e5efd78..87179a571 100644
--- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd
@@ -93,7 +93,7 @@
             <xs:element name="initials" type="xs:string"/>
             <xs:element name="salutation" type="xs:string"/>
             <xs:element name="title" type="xs:string"/>
-            <xs:element name="nameAdditions" type="xs:string"/>F
+            <xs:element name="nameAdditions" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>
 
-- 
2.47.3