CSPACE-2535: Made five fields repeatable in Organization records (records of items...

diff --git a/services/common/src/main/config/services/tenant-bindings.xml b/services/common/src/main/config/services/tenant-bindings.xml
index dac7ad08929317e60b358b14d57a6c7e11ca0559..75c95ae474c7376582570c730c1a0d5ea1ff9935 100644 (file)
--- a/services/common/src/main/config/services/tenant-bindings.xml
+++ b/services/common/src/main/config/services/tenant-bindings.xml
@@ -488,8 +488,8 @@
                               versionable="true" auditable="false"
                               label="organizations_common" updated="" order="1">
                     <service:properties>
-                        <types:item><types:key>authRef</types:key><types:value>contactName</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>subBody</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>contactNames</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>subBodies</types:value></types:item>
                     </service:properties>
 
                     <service:content contentType="application/xml">
@@ -1538,8 +1538,8 @@
                               versionable="true" auditable="false"
                               label="organizations_common" updated="" order="1">
                     <service:properties>
-                        <types:item><types:key>authRef</types:key><types:value>contactName</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>subBody</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>contactNames</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>subBodies</types:value></types:item>
                     </service:properties>
 
                     <service:content contentType="application/xml">

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml
index c6194dd4d1fa9d3c8a885d2a896e53077e986709..40174648763c181bc1961617ae0cb4aab1b8c117 100644 (file)
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -86,14 +86,16 @@
         <row><widget>shortName</widget></row>
         <row><widget>longName</widget></row>
         <row><widget>nameAdditions</widget></row>
-        <row><widget>contactName</widget></row>
+        <!-- Repeatable fields are commented out for now until we -->
+        <!-- identify how to represent these complex types in layouts. -->
+<!--        <row><widget>contactName</widget></row>-->
         <row><widget>foundingDate</widget></row>
         <row><widget>dissolutionDate</widget></row>
         <row><widget>foundingPlace</widget></row>
-        <row><widget>group</widget></row>
-        <row><widget>function</widget></row>
-        <row><widget>subBody</widget></row>
-        <row><widget>history</widget></row>
+<!--        <row><widget>group</widget></row> -->
+<!--        <row><widget>function</widget></row> -->
+<!--        <row><widget>subBody</widget></row> -->
+<!--        <row><widget>historyNote</widget></row>-->
         <row><widget>termStatus</widget></row>
       </rows>
 
@@ -149,7 +151,8 @@
         </properties>
       </widget>
       
-<!--      <widget name="displayNameComputed" type="text">
+<!--
+      <widget name="displayNameComputed" type="text">
         <labels>
           <label mode="any">displayNameComputed</label>
         </labels>
@@ -201,6 +204,7 @@
         </properties>
       </widget>
       
+<!--
       <widget name="contactName" type="text">
         <labels>
           <label mode="any">contactName</label>
@@ -213,6 +217,7 @@
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
+-->
       
       <widget name="foundingDate" type="text">
         <labels>
@@ -253,6 +258,7 @@
         </properties>
       </widget>
 
+<!--
       <widget name="group" type="text">
         <labels>
           <label mode="any">group</label>
@@ -304,6 +310,7 @@
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
+-->
 
       <widget name="termStatus" type="text">
         <labels>

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 8c10c5452397752f197c8a0c70fa210be03e7ef7..6427008d9af977e95587bdc22de104402c14aad6 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
@@ -32,14 +32,44 @@
     <xs:element name="shortName" type="xs:string"/>
     <xs:element name="longName" type="xs:string"/>
     <xs:element name="nameAdditions" type="xs:string"/>
-    <xs:element name="contactName" type="xs:string"/>
+    <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="foundingDate" type="xs:string"/>
     <xs:element name="dissolutionDate" type="xs:string"/>
     <xs:element name="foundingPlace" type="xs:string"/>
-    <xs:element name="group" type="xs:string"/>
-    <xs:element name="function" type="xs:string"/>
-    <xs:element name="subBody" type="xs:string"/>
-    <xs:element name="history" type="xs:string"/>
+    <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="subBodies">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="subBody" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            </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:schema>
 

diff --git a/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java b/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java
index 4f7411fb510d06e4bccce1a4ea4eb0d368133535..c0e19b4f7fe398b2716ca1f5419653ba26178219 100644 (file)
--- a/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java
+++ b/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java
@@ -27,6 +27,8 @@
 package org.collectionspace.services.client;\r
 \r
 import java.util.ArrayList;\r
+import java.util.HashMap;\r
+import java.util.List;\r
 import java.util.Map;\r
 \r
 import javax.ws.rs.core.MediaType;\r
@@ -34,9 +36,15 @@ import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;\r
 \r
 import org.collectionspace.services.OrganizationJAXBSchema;\r
+import org.collectionspace.services.client.test.BaseServiceTest;\r
 import org.collectionspace.services.client.test.ServiceRequestType;\r
+import org.collectionspace.services.organization.ContactNameList;\r
+import org.collectionspace.services.organization.FunctionList;\r
+import org.collectionspace.services.organization.GroupList;\r
+import org.collectionspace.services.organization.HistoryNoteList;\r
 import org.collectionspace.services.organization.OrganizationsCommon;\r
 import org.collectionspace.services.organization.OrgauthoritiesCommon;\r
+import org.collectionspace.services.organization.SubBodyList;\r
 import org.collectionspace.services.person.PersonauthoritiesCommon;\r
 import org.collectionspace.services.person.PersonsCommon;\r
 import org.jboss.resteasy.client.ClientResponse;\r
@@ -144,8 +152,8 @@ public class OrgAuthorityClientUtils {
         commonPart.getHeaders().add("label", headerLabel);\r
 \r
         if(logger.isDebugEnabled()){\r
-               logger.debug("to be created, orgAuthority common ", \r
-                                       orgAuthority, OrgauthoritiesCommon.class);\r
+               logger.debug("to be created, orgAuthority common ",\r
+                        orgAuthority, OrgauthoritiesCommon.class);\r
         }\r
 \r
         return multipart;\r
@@ -162,7 +170,7 @@ public class OrgAuthorityClientUtils {
      */\r
     public static String createItemInAuthority(String inAuthority, \r
                String orgAuthorityRefName, Map<String, String> orgInfo,\r
-               OrgAuthorityClient client) {\r
+                Map<String, List<String>> orgRepeatablesInfo, OrgAuthorityClient client) {\r
        // Expected status code: 201 Created\r
        int EXPECTED_STATUS_CODE = Response.Status.CREATED.getStatusCode();\r
        // Type of service request being tested\r
@@ -175,7 +183,8 @@ public class OrgAuthorityClientUtils {
        }\r
        MultipartOutput multipart =\r
                createOrganizationInstance(inAuthority, orgAuthorityRefName, \r
-                               orgInfo, client.getItemCommonPartName());\r
+                               orgInfo, orgRepeatablesInfo, client.getItemCommonPartName());\r
+\r
        ClientResponse<Response> res = client.createItem(inAuthority, multipart);\r
        String result;\r
        try {   \r
@@ -210,6 +219,27 @@ public class OrgAuthorityClientUtils {
      */\r
     public static MultipartOutput createOrganizationInstance(String inAuthority, \r
                String orgAuthRefName, Map<String, String> orgInfo, String headerLabel){\r
+            final Map<String, List<String>> EMPTY_ORG_REPEATABLES_INFO =\r
+                new HashMap<String, List<String>>();\r
+            return createOrganizationInstance(inAuthority, orgAuthRefName,\r
+                    orgInfo, EMPTY_ORG_REPEATABLES_INFO, headerLabel);\r
+    }\r
+\r
+\r
+    /**\r
+     * Creates the organization instance.\r
+     *\r
+     * @param inAuthority the in authority\r
+     * @param orgAuthRefName the owning Authority ref name\r
+     * @param orgInfo the org info\r
+     * @param orgRepeatablesInfo names and values of repeatable scalar\r
+     *        fields in the Organization record\r
+     * @param headerLabel the header label\r
+     * @return the multipart output\r
+     */\r
+    public static MultipartOutput createOrganizationInstance(String inAuthority, \r
+               String orgAuthRefName, Map<String, String> orgInfo,\r
+                Map<String, List<String>> orgRepeatablesInfo, String headerLabel){\r
         OrganizationsCommon organization = new OrganizationsCommon();\r
         organization.setInAuthority(inAuthority);\r
        String shortId = orgInfo.get(OrganizationJAXBSchema.SHORT_IDENTIFIER);\r
@@ -218,6 +248,7 @@ public class OrgAuthorityClientUtils {
        }       \r
        organization.setShortIdentifier(shortId);\r
                String value = null;\r
+        List<String> values = null;\r
        value = orgInfo.get(OrganizationJAXBSchema.DISPLAY_NAME_COMPUTED);\r
        boolean displayNameComputed = (value==null) || value.equalsIgnoreCase("true"); \r
                organization.setDisplayNameComputed(displayNameComputed);\r
@@ -233,22 +264,42 @@ public class OrgAuthorityClientUtils {
                organization.setLongName(value);\r
         if((value = (String)orgInfo.get(OrganizationJAXBSchema.NAME_ADDITIONS))!=null)\r
                organization.setNameAdditions(value);\r
-        if((value = (String)orgInfo.get(OrganizationJAXBSchema.CONTACT_NAME))!=null)\r
-               organization.setContactName(value);\r
+        if((values = (List<String>)orgRepeatablesInfo.get(OrganizationJAXBSchema.CONTACT_NAMES))!=null) {\r
+                ContactNameList contactsList = new ContactNameList();\r
+                List<String> contactNames = contactsList.getContactName();\r
+               contactNames.addAll(values);\r
+                organization.setContactNames(contactsList);\r
+        }\r
         if((value = (String)orgInfo.get(OrganizationJAXBSchema.FOUNDING_DATE))!=null)\r
                organization.setFoundingDate(value);\r
         if((value = (String)orgInfo.get(OrganizationJAXBSchema.DISSOLUTION_DATE))!=null)\r
                organization.setDissolutionDate(value);\r
         if((value = (String)orgInfo.get(OrganizationJAXBSchema.FOUNDING_PLACE))!=null)\r
                organization.setFoundingPlace(value);\r
-        if((value = (String)orgInfo.get(OrganizationJAXBSchema.GROUP))!=null)\r
-               organization.setGroup(value);\r
-        if((value = (String)orgInfo.get(OrganizationJAXBSchema.FUNCTION))!=null)\r
-               organization.setFunction(value);\r
-        if((value = (String)orgInfo.get(OrganizationJAXBSchema.SUB_BODY))!=null)\r
-               organization.setSubBody(value);\r
-        if((value = (String)orgInfo.get(OrganizationJAXBSchema.HISTORY))!=null)\r
-               organization.setHistory(value);\r
+        if((values = (List<String>)orgRepeatablesInfo.get(OrganizationJAXBSchema.GROUPS))!=null) {\r
+                GroupList groupsList = new GroupList();\r
+                List<String> groups = groupsList.getGroup();\r
+               groups.addAll(values);\r
+                organization.setGroups(groupsList);\r
+        }\r
+        if((values = (List<String>)orgRepeatablesInfo.get(OrganizationJAXBSchema.FUNCTIONS))!=null) {\r
+                FunctionList functionsList = new FunctionList();\r
+                List<String> functions = functionsList.getFunction();\r
+               functions.addAll(values);\r
+                organization.setFunctions(functionsList);\r
+        }\r
+        if((values = (List<String>)orgRepeatablesInfo.get(OrganizationJAXBSchema.SUB_BODIES))!=null) {\r
+                SubBodyList subBodiesList = new SubBodyList();\r
+                List<String> subbodies = subBodiesList.getSubBody();\r
+               subbodies.addAll(values);\r
+                organization.setSubBodies(subBodiesList);\r
+        }\r
+        if((values = (List<String>)orgRepeatablesInfo.get(OrganizationJAXBSchema.HISTORY_NOTES))!=null) {\r
+                HistoryNoteList historyNotesList = new HistoryNoteList();\r
+                List<String> historyNotes = historyNotesList.getHistoryNote();\r
+               historyNotes.addAll(values);\r
+                organization.setHistoryNotes(historyNotesList);\r
+        }\r
         if((value = (String)orgInfo.get(OrganizationJAXBSchema.TERM_STATUS))!=null)\r
                organization.setTermStatus(value);\r
         MultipartOutput multipart = new MultipartOutput();\r

diff --git a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityAuthRefsTest.java b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityAuthRefsTest.java
index 59b5054de0b19fa45e7b7ce908cb0a2be1274b7d..eeb1325f61c4b144b29871f9142dc91e65d2b847 100644 (file)
--- a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityAuthRefsTest.java
+++ b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityAuthRefsTest.java
@@ -195,13 +195,20 @@ public class OrgAuthorityAuthRefsTest extends BaseServiceTest {
             "Test Organization-" + shortId);
         testOrgMap.put(OrganizationJAXBSchema.LONG_NAME, "Test Organization Name");
         testOrgMap.put(OrganizationJAXBSchema.FOUNDING_PLACE, "Anytown, USA");
-        testOrgMap.put(OrganizationJAXBSchema.CONTACT_NAME, organizationContactPersonRefName);
-        testOrgMap.put(OrganizationJAXBSchema.SUB_BODY, subBodyRefName);
+
+        Map<String, List<String>> testOrgRepeatablesMap = new HashMap<String,List<String>>();
+        List<String> testOrgContactNames = new ArrayList<String>();
+        testOrgContactNames.add(organizationContactPersonRefName);
+        testOrgRepeatablesMap.put(OrganizationJAXBSchema.CONTACT_NAMES, testOrgContactNames);
+        List<String> testOrgSubBodies = new ArrayList<String>();
+        testOrgSubBodies.add(subBodyRefName);
+        testOrgRepeatablesMap.put(OrganizationJAXBSchema.SUB_BODIES, testOrgSubBodies);
 
         // Finishing creating the new Organization item, then
         // submit the request to the service and store the response.
         knownItemResourceId = OrgAuthorityClientUtils.createItemInAuthority(
-                       knownResourceId, knownResourceRefName, testOrgMap, orgAuthClient);
+                       knownResourceId, knownResourceRefName, testOrgMap,
+                        testOrgRepeatablesMap, orgAuthClient);
 
         // Store the IDs from every item created by tests,
         // so they can be deleted after tests have been run.
@@ -353,8 +360,10 @@ public class OrgAuthorityAuthRefsTest extends BaseServiceTest {
             logger.debug(objectAsXmlString(organization, OrganizationsCommon.class));
         }
         // Check one or more of the authority fields in the Organization item
-        Assert.assertEquals(organization.getContactName(), organizationContactPersonRefName);
-        Assert.assertEquals(organization.getSubBody(), subBodyRefName);
+        Assert.assertEquals(organization.getContactNames().getContactName().get(0),
+                organizationContactPersonRefName);
+        Assert.assertEquals(organization.getSubBodies().getSubBody().get(0),
+                subBodyRefName);
 
         // Get the auth refs and check them
         // FIXME - need to create this method in the client

diff --git a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java
index ad59422109850dca0f5e644644753fd459c06c51..1f3ffb09a6cd55546a9d50a4037abf71dead2da8 100644 (file)
--- a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java
+++ b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java
@@ -22,6 +22,7 @@
  */
 package org.collectionspace.services.client.test;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -229,12 +230,18 @@ public class OrgAuthorityServiceTest extends AbstractServiceTestImpl {
         testOrgMap.put(OrganizationJAXBSchema.SHORT_IDENTIFIER, shortId);
         testOrgMap.put(OrganizationJAXBSchema.SHORT_NAME, TEST_ORG_SHORTNAME);
         testOrgMap.put(OrganizationJAXBSchema.LONG_NAME, "The real official test organization");
-        testOrgMap.put(OrganizationJAXBSchema.CONTACT_NAME, "joe@test.org");
         testOrgMap.put(OrganizationJAXBSchema.FOUNDING_DATE, "May 26, 1907");
         testOrgMap.put(OrganizationJAXBSchema.FOUNDING_PLACE, TEST_ORG_FOUNDING_PLACE);
-        testOrgMap.put(OrganizationJAXBSchema.FUNCTION, "For testing");
+        
+        Map<String, List<String>> testOrgRepeatablesMap = new HashMap<String,List<String>>();
+        List<String> testOrgContacts = new ArrayList<String>();
+        testOrgContacts.add("joe@example.org");
+        testOrgContacts.add("sally@example.org");
+        testOrgRepeatablesMap.put(OrganizationJAXBSchema.CONTACT_NAMES, testOrgContacts);
+
         String newID = OrgAuthorityClientUtils.createItemInAuthority(
-                       vcsid, authRefName, testOrgMap, client);
+                       vcsid, authRefName, testOrgMap, testOrgRepeatablesMap, client);
+        
         // Store the ID returned from the first item resource created
         // for additional tests below.
         if (knownItemResourceId == null){
@@ -659,7 +666,16 @@ public class OrgAuthorityServiceTest extends AbstractServiceTestImpl {
                    logger.debug(testName + ": returned payload:");
                    logger.debug(objectAsXmlString(organization, OrganizationsCommon.class));
                }
+
+                // Check that the organization item is within the expected OrgAuthority.
                Assert.assertEquals(organization.getInAuthority(), knownResourceId);
+
+                // Verify the number and contents of values in a repeatable field,
+                // as created in the instance record used for testing.
+                List<String> contactNames = organization.getContactNames().getContactName();
+                Assert.assertTrue(contactNames.size() > 0);
+                Assert.assertNotNull(contactNames.get(0));
+
         } finally {
                res.releaseConnection();
         }

diff --git a/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationJAXBSchema.java b/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationJAXBSchema.java
index 8dd893c627aea085d1e58b025e3f2a1bd0fc2fe1..54d2c870bbaec5570a0c0f7fcc2154588c2b448e 100644 (file)
--- a/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationJAXBSchema.java
+++ b/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationJAXBSchema.java
@@ -2,6 +2,7 @@
  * \r
  */\r
 package org.collectionspace.services;\r
+\r
 import org.collectionspace.services.common.vocabulary.AuthorityJAXBSchema;\r
 \r
 /**\r
@@ -9,19 +10,20 @@ import org.collectionspace.services.common.vocabulary.AuthorityJAXBSchema;
  *\r
  */\r
 public interface OrganizationJAXBSchema extends AuthorityJAXBSchema {\r
-       final static String ORGANIZATIONS_COMMON="organizations_common";        \r
-       final static String DISPLAY_NAME_COMPUTED = "displayNameComputed";\r
-       final static String SHORT_NAME = "shortName";\r
-       final static String LONG_NAME = "longName";\r
-       final static String NAME_ADDITIONS = "nameAdditions";\r
-       final static String CONTACT_NAME = "contactName";\r
-       final static String FOUNDING_DATE = "foundingDate";\r
-       final static String DISSOLUTION_DATE = "dissolutionDate";\r
-       final static String FOUNDING_PLACE = "foundingPlace";\r
-    final static String GROUP = "group";\r
-       final static String FUNCTION = "function";\r
-    final static String SUB_BODY = "subBody";\r
-       final static String HISTORY = "history";\r
+\r
+    final static String ORGANIZATIONS_COMMON = "organizations_common";\r
+    final static String DISPLAY_NAME_COMPUTED = "displayNameComputed";\r
+    final static String SHORT_NAME = "shortName";\r
+    final static String LONG_NAME = "longName";\r
+    final static String NAME_ADDITIONS = "nameAdditions";\r
+    final static String CONTACT_NAMES = "contactNames";\r
+    final static String FOUNDING_DATE = "foundingDate";\r
+    final static String DISSOLUTION_DATE = "dissolutionDate";\r
+    final static String FOUNDING_PLACE = "foundingPlace";\r
+    final static String GROUPS = "groups";\r
+    final static String FUNCTIONS = "functions";\r
+    final static String SUB_BODIES = "subBodies";\r
+    final static String HISTORY_NOTES = "historyNotes";\r
 }\r
 \r
 \r

diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd
index 5288b135d23b2a12b6c6521d68d249a6c90d5d0f..314509f7a31254d65a134fa1890ac88fbd65fc26 100644 (file)
--- a/services/organization/jaxb/src/main/resources/organization_common.xsd
+++ b/services/organization/jaxb/src/main/resources/organization_common.xsd
@@ -21,7 +21,7 @@
                 <xs:element name="csid" type="xs:string" />                            
                 <!--  Organization Information Group -->
                 <xs:element name="inAuthority" type="xs:string" />
-                                                               <xs:element name="shortIdentifier" 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"/>
@@ -29,17 +29,47 @@
                 <xs:element name="shortName" type="xs:string"/>
                 <xs:element name="longName" type="xs:string"/>
                 <xs:element name="nameAdditions" type="xs:string"/>
-                <xs:element name="contactName" type="xs:string"/>
+                <xs:element name="contactNames" type="contactNameList"/>
                 <xs:element name="foundingDate" type="xs:string"/>
                 <xs:element name="dissolutionDate" type="xs:string"/>
                 <xs:element name="foundingPlace" type="xs:string"/>
-                <xs:element name="group" type="xs:string"/>
-                <xs:element name="function" type="xs:string"/>
-                <xs:element name="subBody" type="xs:string"/>
-                <xs:element name="history" type="xs:string"/>
+                <xs:element name="groups" type="groupList"/>
+                <xs:element name="functions" type="functionList"/>
+                <xs:element name="subBodies" type="subBodyList"/>
+                <xs:element name="historyNotes" type="historyNoteList"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+
+    <xs:complexType name="contactNameList">
+        <xs:sequence>
+            <xs:element name="contactName" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="groupList">
+        <xs:sequence>
+            <xs:element name="group" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+   <xs:complexType name="functionList">
+        <xs:sequence>
+            <xs:element name="function" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="subBodyList">
+        <xs:sequence>
+            <xs:element name="subBody" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="historyNoteList">
+        <xs:sequence>
+            <xs:element name="historyNote" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
     
     <!-- This is the base class for paginated lists -->
     <xs:complexType name="abstractCommonListItem">