From a490501fce712bf5129807c11bee27838d49c731 Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Tue, 8 May 2012 12:50:27 -0700 Subject: [PATCH] CSPACE-5156: Corrected XPathBase for repeatable term group; fixed several broken termRef XPaths in services tenant bindings, for repeatable term group fields. Removed termType field from Concept list results fields; that field has been moved into the term group. --- .../tenants/tenant-bindings-proto.xml | 22 ++--- .../client/ConceptAuthorityClient.java | 88 +++++++++---------- 2 files changed, 52 insertions(+), 58 deletions(-) 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 01a2ab54d..39e6ff342 100644 --- 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 @@ termRef - orgTermGroupList/*termStatus + orgTermGroupList/*/termStatus @@ -2139,15 +2139,15 @@ termRef - orgTermGroupList/*/termType + locTermGroupList/*/termType termRef - orgTermGroupList/*termLanguage + locTermGroupList/*/termLanguage termRef - orgTermGroupList/*termStatus + locTermGroupList/*/termStatus @@ -2293,11 +2293,11 @@ termRef - placeTermGroupList/*/termLanguage + placeTermGroupList/*/termType termRef - placeTermGroupList/*/termType + placeTermGroupList/*/termLanguage termRef @@ -2583,11 +2583,7 @@ - - - termType - termType - + @@ -2638,11 +2634,11 @@ termRef - conceptTermGroupList/*termLanguage + conceptTermGroupList/*/termLanguage termRef - conceptTermGroupList/*termStatus + conceptTermGroupList/*/termStatus 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 ca9d8d3dd..b9d8dd0bd 100644 --- 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 { - 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 getProxyClass() { - return ConceptAuthorityProxy.class; - } + @Override + public Class 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); + } } -- 2.47.3