From 7a24b4b9c5cb2f75a65076d73c94f46c2428ba2d Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Tue, 19 Apr 2011 22:47:12 +0000
Subject: [PATCH] CSPACE-3782: Search was failing to honor soft-delete flag on
 some services with certain service requests - some services were stepping on
 the request query params.

---
 .../services/acquisition/AcquisitionResource.java            | 2 +-
 .../org/collectionspace/services/common/ResourceBase.java    | 2 +-
 .../services/contact/AuthorityResourceWithContacts.java      | 5 +++--
 .../org/collectionspace/services/intake/IntakeResource.java  | 2 +-
 .../org/collectionspace/services/loanin/LoaninResource.java  | 2 +-
 .../collectionspace/services/loanout/LoanoutResource.java    | 2 +-
 .../collectionspace/services/movement/MovementResource.java  | 2 +-
 .../org/collectionspace/services/report/ReportResource.java  | 2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java
index 16759e398..e707d29e5 100644
--- a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java
+++ b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java
@@ -400,7 +400,7 @@ public class AcquisitionResource
             if (keywords != null && !keywords.isEmpty()) {
                 String whereClause = QueryManager.createWhereClauseFromKeywords(keywords);
                 DocumentFilter documentFilter = handler.getDocumentFilter();
-                documentFilter.setWhereClause(whereClause);
+                documentFilter.appendWhereClause(whereClause, IQueryManager.SEARCH_QUALIFIER_AND);
                 if (logger.isDebugEnabled()) {
                     logger.debug("The WHERE clause is: " + documentFilter.getWhereClause());
                 }
diff --git a/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java b/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
index 6027625a3..d546c77e3 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
@@ -283,7 +283,7 @@ extends AbstractMultiPartCollectionSpaceResourceImpl {
             if (keywords != null && !keywords.isEmpty()) {
             	String whereClause = QueryManager.createWhereClauseFromKeywords(keywords);
 	            DocumentFilter documentFilter = handler.getDocumentFilter();
-	            documentFilter.setWhereClause(whereClause);
+	            documentFilter.appendWhereClause(whereClause, IQueryManager.SEARCH_QUALIFIER_AND);
 	            if (logger.isDebugEnabled()) {
 	            	logger.debug("The WHERE clause is: " + documentFilter.getWhereClause());
 	            }
diff --git a/services/contact/service/src/main/java/org/collectionspace/services/contact/AuthorityResourceWithContacts.java b/services/contact/service/src/main/java/org/collectionspace/services/contact/AuthorityResourceWithContacts.java
index 6d5ce8108..11d5c077c 100644
--- a/services/contact/service/src/main/java/org/collectionspace/services/contact/AuthorityResourceWithContacts.java
+++ b/services/contact/service/src/main/java/org/collectionspace/services/contact/AuthorityResourceWithContacts.java
@@ -260,13 +260,14 @@ public abstract class AuthorityResourceWithContacts<AuthCommon, AuthCommonList,
         	ctx = createServiceContext(getContactServiceName(), queryParams);
             DocumentHandler handler = createContactDocumentHandler(ctx, parentcsid, itemcsid);
             DocumentFilter myFilter = handler.getDocumentFilter(); //new DocumentFilter();
-            myFilter.setWhereClause(ContactJAXBSchema.CONTACTS_COMMON + ":" +
+            myFilter.appendWhereClause(ContactJAXBSchema.CONTACTS_COMMON + ":" +
                 ContactJAXBSchema.IN_AUTHORITY +
                 "='" + parentcsid + "'" +
                 IQueryManager.SEARCH_QUALIFIER_AND +
                 ContactJAXBSchema.CONTACTS_COMMON + ":" +
                 ContactJAXBSchema.IN_ITEM +
-                "='" + itemcsid + "'" );
+                "='" + itemcsid + "'",
+                IQueryManager.SEARCH_QUALIFIER_AND);  // "AND" this clause to any existing
             getRepositoryClient(ctx).getFiltered(ctx, handler);
             contactObjectList = (ContactsCommonList) handler.getCommonPartList();
         } catch (UnauthorizedException ue) {
diff --git a/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java b/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java
index 1ee1dbee4..d9873e0d0 100644
--- a/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java
+++ b/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java
@@ -473,7 +473,7 @@ public class IntakeResource extends
             if (keywords != null && !keywords.isEmpty()) {
             	String whereClause = QueryManager.createWhereClauseFromKeywords(keywords);
 	            DocumentFilter documentFilter = handler.getDocumentFilter();
-	            documentFilter.setWhereClause(whereClause);
+	            documentFilter.appendWhereClause(whereClause, IQueryManager.SEARCH_QUALIFIER_AND);
 	            if (logger.isDebugEnabled()) {
 	            	logger.debug("The WHERE clause is: " + documentFilter.getWhereClause());
 	            }	            
diff --git a/services/loanin/service/src/main/java/org/collectionspace/services/loanin/LoaninResource.java b/services/loanin/service/src/main/java/org/collectionspace/services/loanin/LoaninResource.java
index 256bd251e..e3cb711ef 100644
--- a/services/loanin/service/src/main/java/org/collectionspace/services/loanin/LoaninResource.java
+++ b/services/loanin/service/src/main/java/org/collectionspace/services/loanin/LoaninResource.java
@@ -464,7 +464,7 @@ public class LoaninResource extends
             if (keywords != null && !keywords.isEmpty()) {
             	String whereClause = QueryManager.createWhereClauseFromKeywords(keywords);
 	            DocumentFilter documentFilter = handler.getDocumentFilter();
-	            documentFilter.setWhereClause(whereClause);
+	            documentFilter.appendWhereClause(whereClause, IQueryManager.SEARCH_QUALIFIER_AND);
 	            if (logger.isDebugEnabled()) {
 	            	logger.debug("The WHERE clause is: " + documentFilter.getWhereClause());
 	            }
diff --git a/services/loanout/service/src/main/java/org/collectionspace/services/loanout/LoanoutResource.java b/services/loanout/service/src/main/java/org/collectionspace/services/loanout/LoanoutResource.java
index b27c484e1..614ec5894 100644
--- a/services/loanout/service/src/main/java/org/collectionspace/services/loanout/LoanoutResource.java
+++ b/services/loanout/service/src/main/java/org/collectionspace/services/loanout/LoanoutResource.java
@@ -455,7 +455,7 @@ public class LoanoutResource extends
             if (keywords != null && !keywords.isEmpty()) {
             	String whereClause = QueryManager.createWhereClauseFromKeywords(keywords);
 	            DocumentFilter documentFilter = handler.getDocumentFilter();
-	            documentFilter.setWhereClause(whereClause);
+	            documentFilter.appendWhereClause(whereClause, IQueryManager.SEARCH_QUALIFIER_AND);
 	            if (logger.isDebugEnabled()) {
 	            	logger.debug("The WHERE clause is: " + documentFilter.getWhereClause());
 	            }
diff --git a/services/movement/service/src/main/java/org/collectionspace/services/movement/MovementResource.java b/services/movement/service/src/main/java/org/collectionspace/services/movement/MovementResource.java
index 308d6ec71..6a56a1bf9 100644
--- a/services/movement/service/src/main/java/org/collectionspace/services/movement/MovementResource.java
+++ b/services/movement/service/src/main/java/org/collectionspace/services/movement/MovementResource.java
@@ -471,7 +471,7 @@ public class MovementResource extends AbstractMultiPartCollectionSpaceResourceIm
             if (keywords != null && !keywords.isEmpty()) {
                 String whereClause = QueryManager.createWhereClauseFromKeywords(keywords);
                 DocumentFilter documentFilter = handler.getDocumentFilter();
-                documentFilter.setWhereClause(whereClause);
+                documentFilter.appendWhereClause(whereClause, IQueryManager.SEARCH_QUALIFIER_AND);
                 if (logger.isDebugEnabled()) {
                     logger.debug("The WHERE clause is: " + documentFilter.getWhereClause());
                 }
diff --git a/services/report/service/src/main/java/org/collectionspace/services/report/ReportResource.java b/services/report/service/src/main/java/org/collectionspace/services/report/ReportResource.java
index 80db4a2be..371b2ad3e 100644
--- a/services/report/service/src/main/java/org/collectionspace/services/report/ReportResource.java
+++ b/services/report/service/src/main/java/org/collectionspace/services/report/ReportResource.java
@@ -548,7 +548,7 @@ public class ReportResource extends
             if (keywords != null && !keywords.isEmpty()) {
             	String whereClause = QueryManager.createWhereClauseFromKeywords(keywords);
 	            DocumentFilter documentFilter = handler.getDocumentFilter();
-	            documentFilter.setWhereClause(whereClause);
+	            documentFilter.appendWhereClause(whereClause, IQueryManager.SEARCH_QUALIFIER_AND);
 	            if (logger.isDebugEnabled()) {
 	            	logger.debug("The WHERE clause is: " + documentFilter.getWhereClause());
 	            }	            
-- 
2.47.3