CSPACE-5156: Corrected XPathBase for repeatable term group; fixed several broken...

diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
index 01a2ab54d41b346c212da26e10dcf8ee1b5a1802..39e6ff3423fd8ab76a637273ff1eb34f1a2d1f1a 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
@@ -1804,7 +1804,7 @@
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
                             <types:key>termRef</types:key>
-                            <types:value>orgTermGroupList/*termStatus</types:value>
+                            <types:value>orgTermGroupList/*/termStatus</types:value>
                         </types:item>
                     </service:properties>
                     <service:content contentType="application/xml">
@@ -2139,15 +2139,15 @@
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
                             <types:key>termRef</types:key>
-                            <types:value>orgTermGroupList/*/termType</types:value>
+                            <types:value>locTermGroupList/*/termType</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
                             <types:key>termRef</types:key>
-                            <types:value>orgTermGroupList/*termLanguage</types:value>
+                            <types:value>locTermGroupList/*/termLanguage</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
                             <types:key>termRef</types:key>
-                            <types:value>orgTermGroupList/*termStatus</types:value>
+                            <types:value>locTermGroupList/*/termStatus</types:value>
                         </types:item>
                     </service:properties>
                     <service:content contentType="application/xml">
@@ -2293,11 +2293,11 @@
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
                             <types:key>termRef</types:key>
-                            <types:value>placeTermGroupList/*/termLanguage</types:value>
+                            <types:value>placeTermGroupList/*/termType</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
                             <types:key>termRef</types:key>
-                            <types:value>placeTermGroupList/*/termType</types:value>
+                            <types:value>placeTermGroupList/*/termLanguage</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
                             <types:key>termRef</types:key>
@@ -2583,11 +2583,7 @@
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
                     <service:ListResultsFields>
-                    <!-- Omit the standard AuthorityItem items (they are handled by the code) -->
-                        <service:ListResultField>
-                            <service:element>termType</service:element>
-                            <service:xpath>termType</service:xpath>
-                        </service:ListResultField>
+                        <!-- Omit the standard AuthorityItem items (they are handled by the code) -->
                     </service:ListResultsFields>
                 </service:params>
             </service:DocHandlerParams>
@@ -2638,11 +2634,11 @@
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
                             <types:key>termRef</types:key>
-                            <types:value>conceptTermGroupList/*termLanguage</types:value>
+                            <types:value>conceptTermGroupList/*/termLanguage</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
                             <types:key>termRef</types:key>
-                            <types:value>conceptTermGroupList/*termStatus</types:value>
+                            <types:value>conceptTermGroupList/*/termStatus</types:value>
                         </types:item>
                     </service:properties>
                     <service:content contentType="application/xml">

diff --git a/services/concept/client/src/main/java/org/collectionspace/services/client/ConceptAuthorityClient.java b/services/concept/client/src/main/java/org/collectionspace/services/client/ConceptAuthorityClient.java
index ca9d8d3dddfae2ee59b2d817665a18508eba836c..b9d8dd0bde41085632fe7223b9e2e8565cf1217e 100644 (file)
--- a/services/concept/client/src/main/java/org/collectionspace/services/client/ConceptAuthorityClient.java
+++ b/services/concept/client/src/main/java/org/collectionspace/services/client/ConceptAuthorityClient.java
@@ -1,25 +1,22 @@
-/**    
+/**
  * ConceptAuthorityClient.java
  *
  * {Purpose of This Class}
  *
  * {Other Notes Relating to This Class (Optional)}
  *
- * $LastChangedBy: $
- * $LastChangedRevision: $
- * $LastChangedDate: $
+ * $LastChangedBy: $ $LastChangedRevision: $ $LastChangedDate: $
  *
- * This document is a part of the source code and related artifacts
- * for CollectionSpace, an open source collections management system
- * for museums and related institutions:
+ * This document is a part of the source code and related artifacts for
+ * CollectionSpace, an open source collections management system for museums and
+ * related institutions:
  *
- * http://www.collectionspace.org
- * http://wiki.collectionspace.org
+ * http://www.collectionspace.org http://wiki.collectionspace.org
  *
  * Copyright © 2009 {Contributing Institution}
  *
- * Licensed under the Educational Community License (ECL), Version 2.0.
- * You may not use this file except in compliance with this License.
+ * Licensed under the Educational Community License (ECL), Version 2.0. You may
+ * not use this file except in compliance with this License.
  *
  * You may obtain a copy of the ECL 2.0 License at
  * https://source.collectionspace.org/collection-space/LICENSE.txt
@@ -32,28 +29,29 @@ import org.collectionspace.services.concept.ConceptsCommon;
  * The Class ConceptAuthorityClient.
  */
 public class ConceptAuthorityClient extends AuthorityClientImpl<ConceptsCommon, ConceptAuthorityProxy> {
-       public static final String SERVICE_NAME = "conceptauthorities";
-       public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;       
-       public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;
-       public static final String SERVICE_PAYLOAD_NAME = SERVICE_NAME;
-    public static final String TERM_INFO_GROUP_XPATH_BASE = "conceptTermGroup";
-       //
-       // Subitem constants
-       //
-       public static final String SERVICE_ITEM_NAME = "concepts";
-       public static final String SERVICE_ITEM_PAYLOAD_NAME = SERVICE_ITEM_NAME;
-       //
-       // Payload Part/Schema part names
-       //
-       public static final String SERVICE_COMMON_PART_NAME = SERVICE_NAME + 
-               PART_LABEL_SEPARATOR + PART_COMMON_LABEL;
-       public static final String SERVICE_ITEM_COMMON_PART_NAME = SERVICE_ITEM_NAME + 
-               PART_LABEL_SEPARATOR + PART_COMMON_LABEL;
-       
-       @Override
-       public String getServiceName() {
-               return SERVICE_NAME;
-       }
+
+    public static final String SERVICE_NAME = "conceptauthorities";
+    public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;
+    public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;
+    public static final String SERVICE_PAYLOAD_NAME = SERVICE_NAME;
+    public static final String TERM_INFO_GROUP_XPATH_BASE = "conceptTermGroupList";
+    //
+    // Subitem constants
+    //
+    public static final String SERVICE_ITEM_NAME = "concepts";
+    public static final String SERVICE_ITEM_PAYLOAD_NAME = SERVICE_ITEM_NAME;
+    //
+    // Payload Part/Schema part names
+    //
+    public static final String SERVICE_COMMON_PART_NAME = SERVICE_NAME
+            + PART_LABEL_SEPARATOR + PART_COMMON_LABEL;
+    public static final String SERVICE_ITEM_COMMON_PART_NAME = SERVICE_ITEM_NAME
+            + PART_LABEL_SEPARATOR + PART_COMMON_LABEL;
+
+    @Override
+    public String getServiceName() {
+        return SERVICE_NAME;
+    }
 
     @Override
     public String getServicePathComponent() {
@@ -65,18 +63,18 @@ public class ConceptAuthorityClient extends AuthorityClientImpl<ConceptsCommon,
         return getCommonPartName(SERVICE_ITEM_NAME);
     }
 
-       @Override
-       public Class<ConceptAuthorityProxy> getProxyClass() {
-               return ConceptAuthorityProxy.class;
-       }
+    @Override
+    public Class<ConceptAuthorityProxy> getProxyClass() {
+        return ConceptAuthorityProxy.class;
+    }
 
-       @Override
-       public String getInAuthority(ConceptsCommon item) {
-               return item.getInAuthority();
-       }
+    @Override
+    public String getInAuthority(ConceptsCommon item) {
+        return item.getInAuthority();
+    }
 
-       @Override
-       public void setInAuthority(ConceptsCommon item, String inAuthorityCsid) {
-               item.setInAuthority(inAuthorityCsid);
-       }
+    @Override
+    public void setInAuthority(ConceptsCommon item, String inAuthorityCsid) {
+        item.setInAuthority(inAuthorityCsid);
+    }
 }