This is an automated email from the git hooks/post-receive script. New commit to branch feature/6010-search-document in repository coselmar. See http://git.codelutin.com/coselmar.git commit 4e6da969af4dfaba7655e2467bfa0d0679c351bc Author: Yannick Martel <martel@©odelutin.com> Date: Sat Nov 8 12:47:43 2014 +0100 prepare service for search in documents --- .../fr/ifremer/coselmar/services/v1/DocumentsWebService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java index 4489174..f3cf869 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java @@ -42,9 +42,14 @@ public class DocumentsWebService extends CoselmarWebServiceSupport { return documentBean; } - public List<DocumentBean> getDocuments() { + public List<DocumentBean> getDocuments(List<String> searchKeywords) { - List<Document> documentList = getDocumentDao().findAll(); + List<Document> documentList; + if (searchKeywords != null && !searchKeywords.isEmpty()) { + documentList = getDocumentDao().forContains(Document.PROPERTY_KEYWORDS, searchKeywords).findAll(); + } else { + documentList = getDocumentDao().findAll(); + } List<DocumentBean> result = new ArrayList<>(documentList.size()); for (Document document : documentList) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.