From d1c057540964aea4bfd84bad3188c964a0d6f47d Mon Sep 17 00:00:00 2001
From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Fri, 9 Mar 2012 15:55:10 -0800
Subject: [PATCH] CSPACE-4875 Fixed bug that would include soft-deleted objects
 in search all.

---
 .../config/services/tenants/tenant-bindings-proto.xml     | 8 ++++++++
 .../nuxeo/client/java/RepositoryJavaClientImpl.java       | 1 -
 .../services/servicegroup/ServiceGroupResource.java       | 2 +-
 .../nuxeo/ServiceGroupDocumentModelHandler.java           | 2 ++
 4 files changed, 11 insertions(+), 2 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 61ced7e46..db56e8c3b 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
@@ -1151,6 +1151,10 @@
               <service:element>title</service:element>
               <service:xpath>title</service:xpath>
             </service:ListResultField>
+            <service:ListResultField>
+              <service:element>owner</service:element>
+              <service:xpath>owner</service:xpath>
+            </service:ListResultField>
           </service:ListResultsFields>
         </service:params>
       </service:DocHandlerParams>
@@ -1160,6 +1164,10 @@
           <types:key>objectNameProperty</types:key>
           <types:value>title</types:value>
         </types:item>
+				<types:item xmlns:types="http://collectionspace.org/services/common/types">
+						<types:key>objectNumberProperty</types:key>
+						<types:value>title</types:value>
+				</types:item>
       </service:properties>
       <service:object xmlns:service="http://collectionspace.org/services/common/service" name="Group" version="0.1">
         <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="group-system" updated="" order="0">
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
index 9b66ad51e..2bb8aa96a 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
@@ -471,7 +471,6 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
                         "The findDocs() method must specify at least one DocumentType.");
             }
             DocumentModelList docList = null;
-            // force limit to 1, and ignore totalSize
             QueryContext queryContext = new QueryContext(ctx, whereClause);
             String query = NuxeoUtils.buildNXQLQuery(docTypes, queryContext);
             if (logger.isDebugEnabled()) {
diff --git a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java
index 7f89309b7..dcd5ea369 100644
--- a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java
+++ b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java
@@ -221,7 +221,7 @@ public class ServiceGroupResource extends AbstractCollectionSpaceResourceImpl {
         try {
             MultivaluedMap<String, String> queryParams = ui.getQueryParameters();
             String keywords = queryParams.getFirst(IQueryManager.SEARCH_TYPE_KEYWORDS_KW);
-	        ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(queryParams);
 	        ServiceGroupDocumentModelHandler handler = (ServiceGroupDocumentModelHandler)
 	        				createDocumentHandler(ctx);
 	        ArrayList<String> groupsList = null;  
diff --git a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java
index 6f6c2b907..207321b81 100644
--- a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java
+++ b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java
@@ -105,6 +105,8 @@ public class ServiceGroupDocumentModelHandler
 		            }
 	            }
 	        }
+	        // Make sure we pick up workflow state, etc. 
+	        whereClause = myFilter.getWhereClause();
 	        int pageSize = myFilter.getPageSize();
 	        int pageNum = myFilter.getStartPage();
 	        final boolean computeTotal = true; 
-- 
2.47.3