From cc7665d63131fc11b36c720d4f17427a1a869928 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 3 Nov 2010 22:36:24 +0000
Subject: [PATCH] CSPACE-2933: Moved three Current Location-related fields into
 a repeatable group - services portion of this work.

---
 .../main/resources/schemas/intakes_common.xsd | 20 ++++++++++++++-----
 .../src/main/resources/intakes-common.xsd     | 18 ++++++++++++++---
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd
index 513a48d82..39ef60777 100644
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd
@@ -92,11 +92,7 @@
     
     <!-- Object Location Information Group -->
 
-    <!-- FIXME Start of Current location repeatable group -->
-    <xs:element name="currentLocation" type="xs:string"/>
-    <xs:element name="currentLocationFitness" type="xs:string"/>
-    <xs:element name="currentLocationNote" type="xs:string"/>
-    <!-- FIXME End of Current location repeatable group -->
+    <xs:element name="currentLocationList" type="currentLocationList"/>
 
     <xs:element name="locationDate" type="xs:string"/>
     <xs:element name="normalLocation" type="xs:string"/>
@@ -127,4 +123,18 @@
         </xs:complexType>
     </xs:element>
 
+    <xs:complexType name="currentLocationList">
+        <xs:sequence>
+            <xs:element name="currentLocationGroup" type="currentLocationGroup" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="currentLocationGroup">
+        <xs:sequence>
+            <xs:element name="currentLocation" type="xs:string"/>
+            <xs:element name="currentLocationFitness" type="xs:string"/>
+            <xs:element name="currentLocationNote" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+
 </xs:schema>
diff --git a/services/intake/jaxb/src/main/resources/intakes-common.xsd b/services/intake/jaxb/src/main/resources/intakes-common.xsd
index cae340d7a..4a8f70569 100644
--- a/services/intake/jaxb/src/main/resources/intakes-common.xsd
+++ b/services/intake/jaxb/src/main/resources/intakes-common.xsd
@@ -67,9 +67,7 @@
                 <xs:element name="insurers" type="insurerList"/>
 
                 <!-- Object Location Information Group -->
-                <xs:element name="currentLocation" type="xs:string"/>
-                <xs:element name="currentLocationFitness" type="xs:string"/>
-                <xs:element name="currentLocationNote" type="xs:string"/>
+                <xs:element name="currentLocationList" type="currentLocationList"/>
                 <xs:element name="locationDate" type="xs:string"/>
                 <xs:element name="normalLocation" type="xs:string"/>
 
@@ -121,6 +119,20 @@
         </xs:sequence>
     </xs:complexType>
 
+    <xs:complexType name="currentLocationList">
+        <xs:sequence>
+            <xs:element name="currentLocationGroup" type="currentLocationGroup" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="currentLocationGroup">
+        <xs:sequence>
+            <xs:element name="currentLocation" type="xs:string"/>
+            <xs:element name="currentLocationFitness" type="xs:string"/>
+            <xs:element name="currentLocationNote" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+
     <xs:complexType name="conditionCheckMethodList">
         <xs:sequence>
             <xs:element name="conditionCheckMethod" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-- 
2.47.3