CSPACE-3782: Search was failing to honor soft-delete flag on some services with certa...

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 16759e3983c02bce5a85cfd97f7225f8d25f93f0..e707d29e518443e9beafcdf3d13220097a6fcc91 100644 (file)
--- 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 6027625a34635fcd4ffd71dfb520721898ae4850..d546c77e3a1a086e6a3f16d13ebf8d4cd3351da9 100644 (file)
--- 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()) {\r
                String whereClause = QueryManager.createWhereClauseFromKeywords(keywords);\r
                    DocumentFilter documentFilter = handler.getDocumentFilter();\r
-                   documentFilter.setWhereClause(whereClause);\r
+                   documentFilter.appendWhereClause(whereClause, IQueryManager.SEARCH_QUALIFIER_AND);\r
                    if (logger.isDebugEnabled()) {\r
                        logger.debug("The WHERE clause is: " + documentFilter.getWhereClause());\r
                    }\r

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 6d5ce8108d0307ff785fd64b3e369913fc711b5c..11d5c077cb336f824088c83899e1a296599702a1 100644 (file)
--- 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 1ee1dbee44d58b8812edce09cf4ebf6bce0b8bbb..d9873e0d084821f07f9dbd9b74d30aa4132533b1 100644 (file)
--- 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 256bd251e5560cead655b720a024743a86c47887..e3cb711ef86370f70603fcf1fcb367e1da1dcca3 100644 (file)
--- 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 b27c484e1caa50b89b453ff43880eed35eabe099..614ec5894e73f8cac974c0c2232b311612720d92 100644 (file)
--- 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 308d6ec717742fc16e943eab3107e4506923690b..6a56a1bf99191ec9b2be7aa07f1605d94cf40dae 100644 (file)
--- 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 80db4a2be2e0905d311defca2467b018adbffbcd..371b2ad3e9d6f75f56974097029b151714f1dad3 100644 (file)
--- 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());
                    }