From 805a0c44300a61e0de4505c785231482a1ebbe07 Mon Sep 17 00:00:00 2001
From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Thu, 17 Nov 2011 06:58:04 +0000
Subject: [PATCH] CSPACE-4084 Added updatedAt to each item in refObjs results.

---
 .../common/vocabulary/RefNameServiceUtils.java     |  6 ++++++
 .../services/nuxeo/client/java/DocHandlerBase.java | 14 +++++++++-----
 .../jaxb/src/main/resources/authorityrefdocs.xsd   |  1 +
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
index eedc243c7..5e22beb2a 100644
--- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
+++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
@@ -51,6 +51,7 @@ import org.collectionspace.services.common.document.DocumentNotFoundException;
 import org.collectionspace.services.common.document.DocumentUtils;
 import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.common.repository.RepositoryClient;
+import org.collectionspace.services.nuxeo.client.java.DocHandlerBase;
 import org.collectionspace.services.nuxeo.client.java.RepositoryJavaClientImpl;
 import org.collectionspace.services.common.service.ServiceBindingType;
 import org.collectionspace.services.jaxb.AbstractCommonList;
@@ -296,6 +297,11 @@ public class RefNameServiceUtils {
                 String csid = NuxeoUtils.getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());
                 ilistItem.setDocId(csid);
                 ilistItem.setUri(serviceContextPath + csid);
+                try {
+                	ilistItem.setUpdatedAt(DocHandlerBase.getUpdatedAtAsString(docModel));
+                } catch(Exception e) {
+                	logger.error("Error getting udpatedAt value for doc ["+csid+"]: "+e.getLocalizedMessage());
+                }
                 // The id and URI are the same on all doctypes
                 ilistItem.setDocType(docType);
                 ilistItem.setDocNumber(
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
index 2ce34ae91..91ae0a9b2 100755
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
@@ -163,6 +163,14 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
         return commonList;
     }
 
+	public static String getUpdatedAtAsString(DocumentModel docModel) throws Exception {
+			GregorianCalendar cal = (GregorianCalendar)
+								docModel.getProperty(COLLECTIONSPACE_CORE_SCHEMA,
+											COLLECTIONSPACE_CORE_UPDATED_AT);
+			String updatedAt = DateTimeFormatUtils.formatAsISO8601Timestamp(cal);
+			return updatedAt;
+	}
+
     @Override
     public AbstractCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
         String classname = getDocHandlerParams().getAbstractCommonListClassname();
@@ -192,11 +200,7 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
             item.put(fields[0], id);
             String uri = getUri(docModel);
             item.put(fields[1], uri);
-            GregorianCalendar cal = (GregorianCalendar)
-            					docModel.getProperty(COLLECTIONSPACE_CORE_SCHEMA,
-            								COLLECTIONSPACE_CORE_UPDATED_AT);
-            String updatedAt = DateTimeFormatUtils.formatAsISO8601Timestamp(cal);
-            item.put(fields[2], updatedAt);
+            item.put(fields[2], getUpdatedAtAsString(docModel));
 
             for (ListResultField field : resultsFields ){
             	String schema = field.getSchema();
diff --git a/services/jaxb/src/main/resources/authorityrefdocs.xsd b/services/jaxb/src/main/resources/authorityrefdocs.xsd
index 76f5c4f17..6b555c176 100644
--- a/services/jaxb/src/main/resources/authorityrefdocs.xsd
+++ b/services/jaxb/src/main/resources/authorityrefdocs.xsd
@@ -47,6 +47,7 @@
 									<xs:element name="docName"         type="xs:string" minOccurs="0" />
 									<xs:element name="sourceField"     type="xs:string" minOccurs="1" />
 									<xs:element name="uri"             type="xs:anyURI" minOccurs="1" />
+									<xs:element name="updatedAt"       type="xs:string" minOccurs="1" />
 								</xs:sequence>
 							</xs:complexType>
 						</xs:element>
-- 
2.47.3