From 9112f357a4cf880288b39f751d9222fee66c8bcf Mon Sep 17 00:00:00 2001 From: Neil McErlean Date: Wed, 13 Jul 2011 15:33:32 +0000 Subject: [PATCH] ALF-9385. Refactoring of the findTaggedBlogPosts method. Now a more general findBlogPosts(), which simplifies the webscript implementation slightly & removes possibility of an UnsupportedOperationException. Also added new test case that finds before/after/within specified date ranges. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../scripts/blogs/posts/AbstractGetBlogWebScript.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/blogs/posts/AbstractGetBlogWebScript.java b/source/java/org/alfresco/repo/web/scripts/blogs/posts/AbstractGetBlogWebScript.java index 02a8bec6f0..5cc32422cf 100644 --- a/source/java/org/alfresco/repo/web/scripts/blogs/posts/AbstractGetBlogWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/blogs/posts/AbstractGetBlogWebScript.java @@ -24,12 +24,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.alfresco.model.ContentModel; import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingResults; import org.alfresco.repo.web.scripts.blogs.AbstractBlogWebScript; import org.alfresco.repo.web.scripts.blogs.BlogPostLibJs; import org.alfresco.repo.web.scripts.blogs.RequestUtilsLibJs; import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo; +import org.alfresco.service.cmr.blog.BlogService.RangedDateProperty; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.util.Pair; import org.apache.commons.logging.Log; @@ -174,15 +176,9 @@ public abstract class AbstractGetBlogWebScript extends AbstractBlogWebScript { return getBlogResultsImpl(node, fromDate, toDate, pagingReq); } - // and tag-based Lucene searches with no other query params - else if (fromDate == null && toDate == null) - { - return blogService.findTaggedBlogPosts(node, tag, pagingReq); - } - // But we might change the below to use a Lucene query. else { - throw new UnsupportedOperationException("Cannot get BlogPosts with both tags and date limits."); + return blogService.findBlogPosts(node, new RangedDateProperty(fromDate, toDate, ContentModel.PROP_CREATED), tag, pagingReq); } }