CSPACE-5012: Change inAuthority xpath to ignore namespace, and correct some doctypes.

diff --git a/services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java b/services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java
index 3c7aa9c2d0b3d153799aab77a0fdc05be3da7972..7d51e541cc91673459bfacf9ad92ec47775e6f8a 100644 (file)
--- a/services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java
+++ b/services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java
@@ -59,7 +59,7 @@ public class TemplateExpander {
     
     private static Map<String,String> docTypeSvcNameRegistry = new HashMap<String,String>();
     private static XPath xpath = XPathFactory.newInstance().newXPath();
-    private static final String IN_AUTHORITY_XPATH = "//inAuthority";
+    private static final String IN_AUTHORITY_XPATH = "//*[local-name()='inAuthority']";
 
     protected static String var(String theVar){
         return "\\$\\{"+theVar+"\\}";
@@ -193,10 +193,10 @@ public class TemplateExpander {
     // registration, from configuration, etc. - ADR 2012-05-24
     private static Map<String,String> getDocTypeSvcNameRegistry() {
         if (docTypeSvcNameRegistry.isEmpty()) {
-            docTypeSvcNameRegistry.put("Concept", "Conceptauthorities");
-            docTypeSvcNameRegistry.put("Location", "Locationauthorities");
+            docTypeSvcNameRegistry.put("Conceptitem", "Conceptauthorities");
+            docTypeSvcNameRegistry.put("Locationitem", "Locationauthorities");
             docTypeSvcNameRegistry.put("Person", "Personauthorities");
-            docTypeSvcNameRegistry.put("Place", "Placeauthorities");
+            docTypeSvcNameRegistry.put("Placeitem", "Placeauthorities");
             docTypeSvcNameRegistry.put("Organization", "Orgauthorities");
             docTypeSvcNameRegistry.put("Taxon", "Taxonomyauthority");
         }