From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Tue, 24 Aug 2010 01:37:37 +0000 (+0000)
Subject: CSPACE-2665. Added new fields to the summary list payloads for Movement.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=3c66d0c8c995460c8db9ace652225b00d6846e19;p=tmp%2Fjakarta-migration.git

CSPACE-2665. Added new fields to the summary list payloads for Movement.
---

diff --git a/services/movement/jaxb/src/main/java/org/collectionspace/services/MovementListItemJAXBSchema.java b/services/movement/jaxb/src/main/java/org/collectionspace/services/MovementListItemJAXBSchema.java
index a9d7359cc..ca3fb50c8 100644
--- a/services/movement/jaxb/src/main/java/org/collectionspace/services/MovementListItemJAXBSchema.java
+++ b/services/movement/jaxb/src/main/java/org/collectionspace/services/MovementListItemJAXBSchema.java
@@ -2,6 +2,7 @@ package org.collectionspace.services;
 
 public interface MovementListItemJAXBSchema {
 	final static String MOVEMENT_REFERENCE_NUMBER = "movementReferenceNumber";
+    final static String CURRENT_LOCATION = "currentLocation";
     final static String LOCATION_DATE = "locationDate";
 	final static String CSID = "csid";
 	final static String URI = "url";
diff --git a/services/movement/jaxb/src/main/resources/movements-common.xsd b/services/movement/jaxb/src/main/resources/movements-common.xsd
index 372e20b46..66ea55441 100644
--- a/services/movement/jaxb/src/main/resources/movements-common.xsd
+++ b/services/movement/jaxb/src/main/resources/movements-common.xsd
@@ -74,6 +74,8 @@
                                 <xs:sequence>
                                     <xs:element name="movementReferenceNumber" type="xs:string"
                                         minOccurs="1" />
+                                    <xs:element name="currentLocation" type="xs:string"
+                                        minOccurs="1" />
                                     <xs:element name="locationDate" type="xs:string"
                                         minOccurs="1" />
                                     <!-- uri to retrive details -->
diff --git a/services/movement/service/src/main/java/org/collectionspace/services/movement/nuxeo/MovementDocumentModelHandler.java b/services/movement/service/src/main/java/org/collectionspace/services/movement/nuxeo/MovementDocumentModelHandler.java
index 808b28ebc..002414ba5 100644
--- a/services/movement/service/src/main/java/org/collectionspace/services/movement/nuxeo/MovementDocumentModelHandler.java
+++ b/services/movement/service/src/main/java/org/collectionspace/services/movement/nuxeo/MovementDocumentModelHandler.java
@@ -135,12 +135,15 @@ public class MovementDocumentModelHandler
         MovementsCommonList coList = extractPagingInfo(new MovementsCommonList(), wrapDoc);
         List<MovementsCommonList.MovementListItem> list = coList.getMovementListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
+        String label = getServiceContext().getCommonPartLabel();
         while(iter.hasNext()){
             DocumentModel docModel = iter.next();
             MovementListItem ilistItem = new MovementListItem();
-            ilistItem.setMovementReferenceNumber((String) docModel.getProperty(getServiceContext().getCommonPartLabel(),
+            ilistItem.setMovementReferenceNumber((String) docModel.getProperty(label,
                     MovementJAXBSchema.MOVEMENT_REFERENCE_NUMBER));
-            GregorianCalendar gcal = (GregorianCalendar) docModel.getProperty(getServiceContext().getCommonPartLabel(),
+            ilistItem.setCurrentLocation((String) docModel.getProperty(label,
+                    MovementJAXBSchema.CURRENT_LOCATION));
+            GregorianCalendar gcal = (GregorianCalendar) docModel.getProperty(label,
                     MovementJAXBSchema.LOCATION_DATE);
             ilistItem.setLocationDate(DateTimeFormatUtils.formatAsISO8601Timestamp(gcal));
             String id = NuxeoUtils.extractId(docModel.getPathAsString());