From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Sat, 28 Apr 2012 00:58:56 +0000 (-0700)
Subject: CSPACE-5119: Began revising Person schema with term info group; this work is in progr... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=b48bf4ea0782e7d95dce0f3c57c002e9aa417b23;p=tmp%2Fjakarta-migration.git

CSPACE-5119: Began revising Person schema with term info group; this work is in progress and as yet incomplete.
---

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 dbca58f84..aaa73ccae 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
@@ -12,11 +12,11 @@
 -->
 
 <xs:schema 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:ns="http://collectionspace.org/services/person"
-  xmlns="http://collectionspace.org/services/person"
-  targetNamespace="http://collectionspace.org/services/person"
-  version="0.1"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:ns="http://collectionspace.org/services/person"
+    xmlns="http://collectionspace.org/services/person"
+    targetNamespace="http://collectionspace.org/services/person"
+    version="0.1"
 >
 <!-- See http://wiki.collectionspace.org/display/collectionspace/Person+Service+Home -->    
 
@@ -25,6 +25,10 @@
     <xs:element name="inAuthority" type="xs:string" />
     <xs:element name="shortIdentifier" type="xs:string"/>
     <xs:element name="refName" type="xs:string"/>
+    
+    <!-- Term information group -->
+    <xs:element name="personTermGroupList" type="personTermGroupList"/>
+
     <xs:element name="termStatus" type="xs:string"/>
     <xs:element name="displayName" type="xs:string"/>
     <xs:element name="displayNameComputed" type="xs:boolean"/>
@@ -34,9 +38,6 @@
     <xs:element name="sourcePage" type="xs:string"/>
     <xs:element name="description" type="xs:string"/>
 
-    <!-- FIXME: Currently marked in repeatability spreadsheet as a -->
-    <!-- repeatable group.  However, multiple personal names for the -->
-    <!-- same individual may ultimately be handled using a different approach. -->
     <xs:element name="foreName" type="xs:string"/>
     <xs:element name="middleName" type="xs:string"/>
     <xs:element name="surName" type="xs:string"/>
@@ -44,7 +45,6 @@
     <xs:element name="salutation" type="xs:string"/>
     <xs:element name="title" type="xs:string"/>
     <xs:element name="nameAdditions" type="xs:string"/>
-    <!-- FIXME: End of provisional repeatable group. -->
 
     <xs:element name="birthDate" type="xs:string"/>
     <xs:element name="deathDate" type="xs:string"/>
@@ -81,6 +81,29 @@
     </xs:element>
     <xs:element name="bioNote" type="xs:string"/>
     <xs:element name="nameNote" type="xs:string"/>
+    
+    <xs:complexType name="personTermGroupList">
+        <xs:sequence>
+            <xs:element name="personTermGroup" type="personTermGroup" minOccurs="0"
+                        maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <!-- FIXME: Need to revise these fields per latest schema in -->
+    <!-- CSPACE-4966 and linked pages. -->
+    <xs:complexType name="personTermGroup">
+        <xs:sequence>
+            <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"/>
+        </xs:sequence>
+    </xs:complexType>
+
 
 </xs:schema>