From e352ed784c549078954f7221693d1fb7a648b710 Mon Sep 17 00:00:00 2001
From: Richard Millet <remillet@berkeley.edu>
Date: Thu, 30 Aug 2012 15:51:39 -0700
Subject: [PATCH] CSPACE-5492: Updated tenant bindings prototype file to
 include a supportsHierarchy document hanlder parameter for all authorities

---
 .../config/services/tenants/tenant-bindings-proto.xml      | 7 +++++++
 .../nuxeo/client/java/RemoteDocumentModelHandlerImpl.java  | 7 +++++--
 services/config/src/main/resources/service.xsd             | 2 +-
 3 files changed, 13 insertions(+), 3 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 145584565..e377c5d95 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
@@ -1542,6 +1542,7 @@
             <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.vocabulary.nuxeo.VocabularyItemDocumentModelHandler</service:documentHandler>
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
+                	<service:SupportsHierarchy>true</service:SupportsHierarchy>
                     <service:ListResultsFields>
                         <!-- Omit the standard AuthorityItem fields (they are handled by the code) -->
                         <service:ListResultField>
@@ -1673,6 +1674,7 @@
             <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.organization.nuxeo.OrganizationDocumentModelHandler</service:documentHandler>
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
+                    <service:SupportsHierarchy>true</service:SupportsHierarchy>                
                     <service:ListResultsFields>
                         <!-- Omit the standard AuthorityItem fields (they are handled by the code) -->
                     </service:ListResultsFields>
@@ -1847,6 +1849,7 @@
             <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.person.nuxeo.PersonDocumentModelHandler</service:documentHandler>
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
+                	<service:SupportsHierarchy>true</service:SupportsHierarchy>
                     <service:ListResultsFields>
                         <!-- Omit the standard AuthorityItem fields (they are handled by the code) -->
                         <service:ListResultField>
@@ -2042,6 +2045,7 @@
             <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.location.nuxeo.LocationDocumentModelHandler</service:documentHandler>
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
+                    <service:SupportsHierarchy>true</service:SupportsHierarchy>                
                     <service:ListResultsFields>
                         <!-- Omit the standard AuthorityItem fields (they are handled by the code) -->
                     </service:ListResultsFields>
@@ -2187,6 +2191,7 @@
             <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.place.nuxeo.PlaceDocumentModelHandler</service:documentHandler>
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
+                    <service:SupportsHierarchy>true</service:SupportsHierarchy>                
                     <service:ListResultsFields>
                         <!-- Omit the standard AuthorityItem fields (they are handled by the code) -->
                     </service:ListResultsFields>
@@ -2370,6 +2375,7 @@
             <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.taxonomy.nuxeo.TaxonDocumentModelHandler</service:documentHandler>
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
+                    <service:SupportsHierarchy>true</service:SupportsHierarchy>                
                     <service:ListResultsFields>
                         <!-- Omit the standard AuthorityItem fields (they are handled by the code) -->
                         <!-- Uncomment when bug in returning list result values from complex types,
@@ -2565,6 +2571,7 @@
             <service:initHandler xmlns:service="http://collectionspace.org/services/config/service">
                 <service:classname>org.collectionspace.services.common.init.AddIndices</service:classname>
                 <service:params>
+                    <service:SupportsHierarchy>true</service:SupportsHierarchy>                
                     <service:field>
                         <service:table>concepts_common</service:table>
                         <service:col>inauthority</service:col>
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
index ef3388864..6f6a1e3c6 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
@@ -137,16 +137,19 @@ public abstract class   RemoteDocumentModelHandlerImpl<T, TL>
     
     @Override
     public boolean supportsHierarchy() {
-    	boolean result;
+    	boolean result = false;
     	
     	DocHandlerParams.Params params = null;
     	try {
 			params = getDocHandlerParams();
+			Boolean bool = params.isSupportsHierarchy();
+			if (bool != null) {
+				result = bool.booleanValue();
+			}
 		} catch (DocumentException e) {
 			// TODO Auto-generated catch block
 			logger.error(String.format("Could not get document handler params for class %s", this.getClass().getName()), e);
 		}
-		result = params.isSupportsHierarchy();
     	
     	return result;
     }
diff --git a/services/config/src/main/resources/service.xsd b/services/config/src/main/resources/service.xsd
index 8726ef87b..45cc84096 100644
--- a/services/config/src/main/resources/service.xsd
+++ b/services/config/src/main/resources/service.xsd
@@ -239,7 +239,7 @@
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element name="SchemaName" type="xs:string" minOccurs="0" maxOccurs="1"/>
-                        <xs:element name="supportsHierarchy" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false"/>
+                        <xs:element name="SupportsHierarchy" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false"/>
                         <xs:element name="DublinCoreTitle" type="xs:string" minOccurs="0" maxOccurs="1"/>
                         <xs:element name="SummaryFields" type="xs:string" minOccurs="0" maxOccurs="1"/>
                         <xs:element name="AbstractCommonListClassname" type="xs:string" minOccurs="0" maxOccurs="1"/>
-- 
2.47.3