inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
93581: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93484: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93197: Merged DEV to V4.2-BUG-FIX (4.2.5)
            92217: MNT-12957 : Paging doesn't work on discussions 
               - Remove limit for count topics. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94968 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 12:26:49 +00:00
parent 0ac6c532d7
commit cb4f8529ec
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/repo/discussion/DiscussionServiceImpl.java
View File

@@ -743,11 +743,6 @@ public class DiscussionServiceImpl implements DiscussionService
sp.setLanguage(SearchService.LANGUAGE_LUCENE); sp.setLanguage(SearchService.LANGUAGE_LUCENE);
sp.setQuery(luceneQuery.toString()); sp.setQuery(luceneQuery.toString());
sp.addSort(sortOn, sortAscending); sp.addSort(sortOn, sortAscending);
if (paging.getMaxItems() > 0)
{
sp.setLimit(paging.getMaxItems());
sp.setLimitBy(LimitBy.FINAL_SIZE);
}
if (paging.getSkipCount() > 0) if (paging.getSkipCount() > 0)
{ {
sp.setSkipCount(paging.getSkipCount()); sp.setSkipCount(paging.getSkipCount());
@@ -761,7 +756,7 @@ public class DiscussionServiceImpl implements DiscussionService
try try
{ {
results = searchService.query(sp); results = searchService.query(sp);
pagedResults = wrap(results, nodeRef); pagedResults = wrap(results, nodeRef, paging);
} }
finally finally
{ {
@@ -938,14 +933,20 @@ public class DiscussionServiceImpl implements DiscussionService
/** /**
* Our class to wrap up search results as {@link TopicInfo} instances * Our class to wrap up search results as {@link TopicInfo} instances
*/ */
private PagingResults<TopicInfo> wrap(final ResultSet finalLuceneResults, final NodeRef container) private PagingResults<TopicInfo> wrap(final ResultSet finalLuceneResults, final NodeRef container, final PagingRequest paging)
{ {
final List<TopicInfo> topics = new ArrayList<TopicInfo>(); final List<TopicInfo> topics = new ArrayList<TopicInfo>();
int cnt = 1;
for (ResultSetRow row : finalLuceneResults) for (ResultSetRow row : finalLuceneResults)
{ {
TopicInfo topic = buildTopic( TopicInfo topic = buildTopic(
row.getNodeRef(), container, row.getQName().getLocalName()); row.getNodeRef(), container, row.getQName().getLocalName());
topics.add(topic); topics.add(topic);
cnt++;
if (paging.getMaxItems()>0 && cnt>paging.getMaxItems())
{
break;
}
} }
// Wrap // Wrap
@@ -974,7 +975,9 @@ public class DiscussionServiceImpl implements DiscussionService
{ {
skipCount = finalLuceneResults.getStart(); skipCount = finalLuceneResults.getStart();
} }
catch(UnsupportedOperationException e) {} catch(UnsupportedOperationException e) {
skipCount = paging.getSkipCount();
}
try try
{ {
itemsRemainingAfterThisPage = finalLuceneResults.length(); itemsRemainingAfterThisPage = finalLuceneResults.length();