From 4f8c80db55fad4e5fd01a8c39218e3ad02b95572 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 9 Jan 2013 12:20:03 -0800
Subject: [PATCH] CSPACE-5728: First successful top-to-bottom run of the single
 CSID batch job to update computed current location. Uses JDOM, not dom4j, to
 get field value. XmlReplay test validation is also now more strict.

---
 .../xmlreplay/batch/batch-update-object-loc.xml      |  8 ++++----
 .../batch/nuxeo/UpdateObjectLocationBatchJob.java    | 12 +++++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
index 3b1fb8eaf..84088950e 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
@@ -37,7 +37,7 @@
         </test>
         
         <!-- The currentLocation value of this Movement record, which -->
-        <!-- has the most recent locationDate value, should thus be -->
+        <!-- has the most recent locationDate value, should also be -->
         <!-- reflected in the computedCurrentLocation value in the -->
         <!-- CollectionObject record after invoking the batch job. -->
         <test ID="createMovement2">
@@ -122,7 +122,7 @@
             <uri>/cspace-services/collectionobjects/${createCollectionObject.CSID}</uri>
             <filename>batch/updateobjloc.xml</filename>
             <response>
-                <expected level="TEXT" />
+                <expected level="ADDOK" />
                 <filename>batch/res/collectionobject.res.xml</filename>
                 <vars>
                     <var ID="computedCurrentLocationValue">${createMovement2.currentLocation}</var>
@@ -134,7 +134,7 @@
         <!-- Tests with Movement->CollectionObject relations -->
         
         <!-- The currentLocation value of this new Movement record, which now -->
-        <!-- has the most recent locationDate value, should thus be -->
+        <!-- has the most recent locationDate value, should also be -->
         <!-- reflected in the computedCurrentLocation value in the -->
         <!-- CollectionObject record after invoking the batch job a second time. -->
         <test ID="createMovement4">
@@ -179,7 +179,7 @@
             <uri>/cspace-services/collectionobjects/${createCollectionObject.CSID}</uri>
             <filename>batch/updateobjloc.xml</filename>
             <response>
-                <expected level="TEXT" />
+                <expected level="ADDOK" />
                 <filename>batch/res/collectionobject.res.xml</filename>
                 <vars>
                     <var ID="computedCurrentLocationValue">${createMovement4.currentLocation}</var>
diff --git a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/UpdateObjectLocationBatchJob.java b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/UpdateObjectLocationBatchJob.java
index a61f30f63..eed439135 100644
--- a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/UpdateObjectLocationBatchJob.java
+++ b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/UpdateObjectLocationBatchJob.java
@@ -156,9 +156,19 @@ public class UpdateObjectLocationBatchJob extends AbstractBatchInvocable {
         try {
             Document document = builder.build(new StringReader(payload.toXML()));
             Element root = document.getRootElement();
+            // The part element is always expected to have an explicit namespace.
             Element part = root.getChild(partLabel, partNamespace);
+            // Try getting the field element both with and without a namespace.
+            // Even though a field element that lacks a namespace prefix
+            // may yet inherit its namespace from a parent, JDOM may require that
+            // the getChild() call be made without a namespace.
             Element field = part.getChild(fieldPath, partNamespace);
-            value = field.getText();
+            if (field == null) {
+                field = part.getChild(fieldPath);
+            }
+            if (field != null) {
+                value = field.getText();
+            }
         } catch (Exception e) {
             logger.error("Error getting value from field path " + fieldPath
                     + " in schema part " + partLabel);
-- 
2.47.3