From e98e6958db9ca68cc3ef92d109d72ed92031e35f Mon Sep 17 00:00:00 2001 From: Richard Millet Date: Tue, 26 Jul 2011 21:58:16 +0000 Subject: [PATCH] CSPACE-4214: Support for field level searches across most services. Includes support for simple scalar and multi-valued scalar fields only. --- .../org/collectionspace/services/batch/BatchResource.java | 4 ++-- .../org/collectionspace/services/blob/BlobResource.java | 8 ++++---- .../services/client/test/AbstractServiceTestImpl.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java b/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java index cad1a58b7..cc9e01425 100644 --- a/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java +++ b/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java @@ -114,14 +114,14 @@ public class BatchResource extends ResourceBase { @Context UriInfo ui) { AbstractCommonList list; if (docType != null && !docType.isEmpty() && mode != null && !mode.isEmpty()) { - list = search(ui.getQueryParameters(), docType, mode); + list = batchSearch(ui.getQueryParameters(), docType, mode); } else { list = getList(ui); } return list; } - protected AbstractCommonList search(MultivaluedMap queryParams, + private AbstractCommonList batchSearch(MultivaluedMap queryParams, String docType, String mode) { try { ServiceContext ctx = createServiceContext(queryParams); diff --git a/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java b/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java index 059076801..9126c7835 100644 --- a/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java +++ b/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java @@ -89,10 +89,10 @@ public class BlobResource extends ResourceBase { return (CommonList) getList(csidList); } - @Deprecated - protected CommonList search(MultivaluedMap queryParams,String keywords) { - return (CommonList) super.search(queryParams, keywords); - } +// @Deprecated +// protected CommonList search(MultivaluedMap queryParams,String keywords) { +// return (CommonList) super.search(queryParams, keywords); +// } private CommonList getDerivativeList(ServiceContext ctx, String csid) throws Exception { diff --git a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java index b342f7f1e..4363ffaa8 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java +++ b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java @@ -803,7 +803,7 @@ public abstract class AbstractServiceTestImpl extends BaseServiceTest implements /* * Test that searches honor the workflow deleted state. */ -// @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class) + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class) public void searchWorkflowDeleted(String testName) throws Exception { // FIXME: Temporarily avoid running test if client is of an authority service -- 2.47.3