From b7cb4fee8b421d383187b487c5262fc49b668b9e Mon Sep 17 00:00:00 2001
From: Laramie Crocker <laramie@berkeley.edu>
Date: Tue, 14 Dec 2010 00:53:15 +0000
Subject: [PATCH] CSPACE-3311 acquisition return primary value of owner and
 acquisitionSource in summary fields

---
 .../client/test/AcquisitionServiceTest.java   |  9 +++---
 .../AcquisitionListItemJAXBSchema.java        | 11 +++++--
 .../main/resources/acquisitions_common.xsd    |  4 +--
 .../AcquisitionDocumentModelHandler.java      | 29 ++++++-------------
 4 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java
index cadcaedc9..5863acadd 100644
--- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java
+++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java
@@ -414,11 +414,10 @@ public class AcquisitionServiceTest extends AbstractServiceTestImpl {
                     item.getCsid());
                 logger.debug(testName + ": list-item[" + i + "] objectNumber=" +
                     item.getAcquisitionReferenceNumber());
-                logger.debug(testName + ": list-item[" + i + "] acquisitionSources:");
-                AcquisitionSourceList acqSource = item.getAcquisitionSources();
-                for (String acquisitionSource : acqSource.getAcquisitionSource()) {
-                    logger.debug("acquisitionSource=" + acquisitionSource);
-                }
+                logger.debug(testName + ": list-item[" + i + "] acquisitionSource=" +
+                    item.getAcquisitionSource());
+                logger.debug(testName + ": list-item[" + i + "] owner=" +
+                    item.getOwner());
                 logger.debug(testName + ": list-item[" + i + "] URI=" +
                     item.getUri());
                 i++;
diff --git a/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java b/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java
index 9ee57f594..cde3b8e75 100644
--- a/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java
+++ b/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java
@@ -2,8 +2,13 @@ package org.collectionspace.services;
 
 public interface AcquisitionListItemJAXBSchema {
 	final static String ACQUISITION_REFERENCE_NUMBER = "acquisitionReferenceNumber";
-	final static String ACQUISITION_SOURCES = "acquisitionSources";
-	final static String OWNERS = "owners";
-	final static String CSID = "csid";
+    final static String ACQUISITION_SOURCE = "acquisitionSource";
+    final static String ACQUISITION_SOURCES = "acquisitionSources";
+    //final static String ACQUISITION_SOURCE_LIST = "acquisitionSourceList";
+
+    final static String OWNER = "owner";
+    final static String OWNERS = "owners";
+    //final static String OWNER_LIST = "ownerList";
+    final static String CSID = "csid";
 	final static String URI = "url";
 }
diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index c6dd5a403..ac8d05288 100644
--- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
+++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
@@ -123,9 +123,9 @@
                                 <xs:sequence>
                                     <xs:element name="acquisitionReferenceNumber" type="xs:string"
                                         minOccurs="1" />
-                                    <xs:element name="acquisitionSources" type="acquisitionSourceList"
+                                    <xs:element name="acquisitionSource" type="xs:string"
                                         minOccurs="1" />
-                                    <xs:element name="owners" type="ownerList"
+                                    <xs:element name="owner" type="xs:string"
                                         minOccurs="1" />
                                     <!-- uri to retrive acquisition details -->
                                     <xs:element name="uri" type="xs:anyURI"
diff --git a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
index ce32851fc..6267b2c72 100644
--- a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
+++ b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
@@ -119,28 +119,17 @@ public class AcquisitionDocumentModelHandler
         while (iter.hasNext()) {
             DocumentModel docModel = iter.next();
             AcquisitionListItem listItem = new AcquisitionListItem();
+
             listItem.setAcquisitionReferenceNumber((String) docModel.getProperty(label,
                     AcquisitionListItemJAXBSchema.ACQUISITION_REFERENCE_NUMBER));
-            
-            // docModel.getProperty returns an ArrayList here.
-            List<String> acquisitionSources =
-                 (List<String>) docModel.getProperty(label,
-                     AcquisitionListItemJAXBSchema.ACQUISITION_SOURCES);
-            AcquisitionSourceList acquisitionSourceList = new AcquisitionSourceList();
-            for (String acquisitionSource : acquisitionSources) {
-                  acquisitionSourceList.getAcquisitionSource().add(acquisitionSource);
-            }
-            listItem.setAcquisitionSources(acquisitionSourceList);
-
-            // and here ...
-            List<String> owners = 
-                 (List<String>) docModel.getProperty(label,
-                     AcquisitionListItemJAXBSchema.OWNERS);
-            OwnerList ownerList = new OwnerList();
-            for (String owner : owners) {
-                  ownerList.getOwner().add(owner);
-            }
-            listItem.setOwners(ownerList);
+
+            List<Object> acquisitionSources =(List<Object>) docModel.getProperty(label,AcquisitionListItemJAXBSchema.ACQUISITION_SOURCES);
+            String primaryAcquisitionSource = primaryValueFromMultivalue(acquisitionSources,AcquisitionListItemJAXBSchema.ACQUISITION_SOURCE);
+            listItem.setAcquisitionSource(primaryAcquisitionSource);
+
+            List<Object> owners =(List<Object>) docModel.getProperty(label,AcquisitionListItemJAXBSchema.OWNERS);
+            String primaryOwner = primaryValueFromMultivalue(owners,AcquisitionListItemJAXBSchema.OWNER);
+            listItem.setOwner(primaryOwner);
 
             //need fully qualified context for URI
             String id = NuxeoUtils.extractId(docModel.getPathAsString());
-- 
2.47.3