From aa700571db15bda511cd8be4a643915153357f4f Mon Sep 17 00:00:00 2001
From: Neil McErlean <neil.mcerlean@alfresco.com>
Date: Wed, 13 Jul 2011 15:45:00 +0000
Subject: [PATCH] ALF-9385. Passed pagingReq skipCount and maxItems through to
 the Lucene query. Also removed some unnecessary logging.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28990 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../java/org/alfresco/repo/blog/BlogServiceImpl.java  | 11 ++++++++---
 .../org/alfresco/repo/blog/BlogServiceImplTest.java   | 10 ----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/source/java/org/alfresco/repo/blog/BlogServiceImpl.java b/source/java/org/alfresco/repo/blog/BlogServiceImpl.java
index 856bd9a1f7..1809308884 100644
--- a/source/java/org/alfresco/repo/blog/BlogServiceImpl.java
+++ b/source/java/org/alfresco/repo/blog/BlogServiceImpl.java
@@ -301,6 +301,10 @@ public class BlogServiceImpl implements BlogService
         sp.setLanguage(SearchService.LANGUAGE_LUCENE);
         sp.setQuery(luceneQuery.toString());
         sp.addSort(ContentModel.PROP_PUBLISHED.toString(), false);
+        
+        sp.setMaxItems(pagingReq.getMaxItems());
+        sp.setSkipCount(pagingReq.getSkipCount());
+        
         ResultSet luceneResults = null;
         PagingResults<BlogPostInfo> results = null;
         try
@@ -332,9 +336,10 @@ public class BlogServiceImpl implements BlogService
                 @Override
                 public Pair<Integer, Integer> getTotalResultCount()
                 {
-                    int size = finalLuceneResults.getNodeRefs().size();
-                    //FIXME Impl
-                    return new Pair<Integer, Integer>(size, size);
+                    int skipCount = finalLuceneResults.getStart();
+                    int itemsRemainingAfterThisPage = finalLuceneResults.length();
+                    final int totalItemsInUnpagedResultSet = skipCount + itemsRemainingAfterThisPage;
+                    return new Pair<Integer, Integer>(totalItemsInUnpagedResultSet, totalItemsInUnpagedResultSet);
                 }
                 
                 @Override
diff --git a/source/java/org/alfresco/repo/blog/BlogServiceImplTest.java b/source/java/org/alfresco/repo/blog/BlogServiceImplTest.java
index 604081aee9..b4b8aa70d7 100644
--- a/source/java/org/alfresco/repo/blog/BlogServiceImplTest.java
+++ b/source/java/org/alfresco/repo/blog/BlogServiceImplTest.java
@@ -407,16 +407,6 @@ public class BlogServiceImplTest
                     final RangedDateProperty publishedAfter1980 = new RangedDateProperty(_1980, null, ContentModel.PROP_PUBLISHED);
                     final RangedDateProperty publishedBetween1975And1985 = new RangedDateProperty(_1975, _1985, ContentModel.PROP_PUBLISHED);
                     
-                    List<ChildAssociationRef> children = NODE_SERVICE.getChildAssocs(BLOG_CONTAINER_NODE);
-                    for (ChildAssociationRef child : children)
-                    {
-                        Map<QName, Serializable> props = NODE_SERVICE.getProperties(child.getChildRef());
-                        System.out.println(props);
-                        System.out.println("cm:name " + props.get(ContentModel.PROP_NAME));
-                        System.out.println("cm:publ " + props.get(ContentModel.PROP_PUBLISHED));
-                        System.out.println();
-                    }
-                    
                     // Find all
                     PagingResults<BlogPostInfo> pagedResults = BLOG_SERVICE.findBlogPosts(BLOG_CONTAINER_NODE, null, null, pagingReq);
                     assertEquals("Wrong number of blog posts", 3, pagedResults.getPage().size());