From: Richard Millet <richard.millet@berkeley.edu>
Date: Mon, 11 Apr 2011 17:15:29 +0000 (+0000)
Subject: CSPACE-3782: Filter for keywords was stepping on workflow filter.  Keyword 'where... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=eb3eb2b2bf0b0b2e99a93e39cfd1e9f5bb763516;p=tmp%2Fjakarta-migration.git

CSPACE-3782: Filter for keywords was stepping on workflow filter.  Keyword 'where' clause is now appending to existing clause.
---

diff --git a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java
index dacf30e43..24e2daacb 100644
--- a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java
+++ b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java
@@ -552,7 +552,7 @@ public class CollectionObjectResource
             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());
                 }