CSPACE-2559: Summary lists of Acquisition records, returned by the Acquisitions servi...

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 f0e54a5c12928b74479fe61278ceb962275f95c6..453570c6f66354958785d8838dbd37d33ecd4beb 100644 (file)
--- 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
@@ -121,14 +121,8 @@ public class AcquisitionDocumentModelHandler
                  (List<String>) docModel.getProperty(getServiceContext().getCommonPartLabel(),
                      AcquisitionListItemJAXBSchema.ACQUISITION_SOURCES);
             AcquisitionSourceList acquisitionSourceList = new AcquisitionSourceList();
-            NameValue nv = new NameValue();
             for (String acquisitionSource : acquisitionSources) {
-                try {
-                  nv = unqualify(acquisitionSource);
-                  acquisitionSourceList.getAcquisitionSource().add(nv.value);
-                } catch (IllegalStateException ise) {
-                    logger.warn("acquisition source=" + acquisitionSource, ise);
-                }
+                  acquisitionSourceList.getAcquisitionSource().add(acquisitionSource);
             }
             listItem.setAcquisitionSources(acquisitionSourceList);
             //need fully qualified context for URI
@@ -179,21 +173,5 @@ public class AcquisitionDocumentModelHandler
         String value;
     };
 
-    private static NameValue unqualify(String input) {
-        NameValue nv = new NameValue();
-        StringTokenizer stz = new StringTokenizer(input, NAME_VALUE_SEPARATOR);
-        int tokens = stz.countTokens();
-        if (tokens == 2) {
-            nv.name = stz.nextToken();
-            nv.value = stz.nextToken();
-        // Allow null or empty values
-        } else if (tokens == 1) {
-            nv.name = stz.nextToken();
-            nv.value = "";
-        } else {
-            throw new IllegalStateException("Unexpected format for multi valued element: " + input);
-        }
-        return nv;
-    }
 }