From c9ccce723ae1c35c213d9de7458abbcfccf8749f Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 15 May 2013 17:43:31 -0700
Subject: [PATCH] CSPACE-5989: Added configuration block, with commented-out
 override in demo lifesci tenant, for the setting that can constrain JDBC
 queries to the current tenant.

---
 .../tenants/lifesci/tenant-bindings.delta.xml   |  7 +++++++
 .../services/tenants/tenant-bindings-proto.xml  | 17 ++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
index 385d81f2d..e7946cac7 100644
--- a/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
@@ -27,6 +27,13 @@
                 <types:value>100</types:value>
             </types:item>
             -->
+            <!--
+            <types:item id="jdbcqueriestenantrestricted" xmlns:types="http://collectionspace.org/services/config/types"
+                        merge:matcher="id" merge:action="replace">
+                <types:key>jdbcQueriesAreTenantIdRestricted</types:key>
+                <types:value>false</types:value>
+            </types:item>
+            -->
         </tenant:properties>
 	
 	<tenant:serviceBindings merge:matcher="id" id="CollectionObjects">
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 09bbd592f..beb8525e9 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
@@ -61,7 +61,8 @@
                 just at the beginning of a term.
 
                 See the tenant-bindings.delta.xml file for the 'lifesci' tenant,
-                for an example of how to override this value in your tenant.
+                for examples of how to override this value, and other, similar
+                values below, in your own tenant.
             -->
             <types:item id="ptstartingwildcard" xmlns:types="http://collectionspace.org/services/config/types">
                 <types:key>ptStartingWildcard</types:key>
@@ -70,13 +71,23 @@
             <!--
                By default, term completion searches return a maximum number
                of terms in their search results. The default value is 40 terms.
-               See the tenant-bindings.delta.xml file for the 'lifesci' tenant,
-               for an example of how to override this value in your tenant.
             -->
             <types:item id="maxlistitemsjdbc" xmlns:types="http://collectionspace.org/services/config/types">
                 <types:key>maxListItemsReturnedLimitOnJdbcQueries</types:key>
                 <types:value>40</types:value>
             </types:item>
+             <!--
+               By default, term completion searches are restricted (constrained)
+               to the current tenant. On a system where a tenant's data is
+               isolated within its own repository, or on a shared repository
+               system where only one tenant has data, this restriction can be
+               removed by setting the value below to 'false'. That will remove
+               one SQL JOIN from the query, potentially improving search performance.
+            -->
+            <types:item id="jdbcqueriestenantrestricted" xmlns:types="http://collectionspace.org/services/config/types">
+                <types:key>jdbcQueriesAreTenantIdRestricted</types:key>
+                <types:value>true</types:value>
+            </types:item>
         </tenant:properties>        
         
         <!-- begin idgenerator service meta-data -->
-- 
2.47.3