From 5c175b0b26dc10ad1ee6a5696030d263e5561c09 Mon Sep 17 00:00:00 2001 From: Ray Lee Date: Wed, 30 May 2012 17:50:35 -0700 Subject: [PATCH] CSPACE-5012: Change inAuthority xpath to ignore namespace, and correct some doctypes. --- .../services/imports/TemplateExpander.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 3c7aa9c2d..7d51e541c 100644 --- 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 docTypeSvcNameRegistry = new HashMap(); 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 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"); } -- 2.47.3