From eec307f08c80df0f38445fc7c307348ef2f46f26 Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Thu, 29 Jul 2010 22:00:53 +0000 Subject: [PATCH] CSPACE-2559: Summary lists of Acquisition records, returned by the Acquisitions service, now once again correctly return values, in the value instances of the repeatable acquisitionSource field. This was a regression bug triggered by the removal of field qualification (prefixing by a field name and delimiter) in r2707, as well as my use of a private unqualify() method in the Acquisition service. --- .../AcquisitionDocumentModelHandler.java | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) 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 f0e54a5c1..453570c6f 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 @@ -121,14 +121,8 @@ public class AcquisitionDocumentModelHandler (List) 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; - } } -- 2.47.3