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

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

Browse Source 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/repo/links/LinksServiceImpl.java
View File

@@ -388,11 +388,6 @@ public class LinksServiceImpl implements LinksService
sp.setLanguage(SearchService.LANGUAGE_LUCENE);
sp.setQuery(luceneQuery.toString());
sp.addSort(sortOn, false);
if (paging.getMaxItems() > 0)
{
sp.setLimit(paging.getMaxItems());
sp.setLimitBy(LimitBy.FINAL_SIZE);
}
if (paging.getSkipCount() > 0)
{
sp.setSkipCount(paging.getSkipCount());
@@ -406,7 +401,7 @@ public class LinksServiceImpl implements LinksService
try
{
results = searchService.query(sp);
pagedResults = wrap(results, container);
pagedResults = wrap(results, container, paging);
}
finally
{
@@ -419,14 +414,20 @@ public class LinksServiceImpl implements LinksService
return pagedResults;
}
private PagingResults<LinkInfo> wrap(final ResultSet finalLuceneResults, final NodeRef container)
private PagingResults<LinkInfo> wrap(final ResultSet finalLuceneResults, final NodeRef container, final PagingRequest paging)
{
final List<LinkInfo> links = new ArrayList<LinkInfo>();
int cnt = 1;
for (ResultSetRow row : finalLuceneResults)
{
LinkInfo link = buildLink(
row.getNodeRef(), container, row.getQName().getLocalName());
links.add(link);
cnt++;
if (paging.getMaxItems()>0 && cnt>paging.getMaxItems())
{
break;
}
}
// Wrap