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 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
130286 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130025 gjames: SEARCH-114: TotalItems won't be set if we are not sure its accurate.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 22:08:47 +00:00
parent 55a405d41f
commit f6b366cb01
1 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
View File

@@ -45,7 +45,7 @@ import java.util.List;
import java.util.Map;
/**
* Maps from a Solr ResultSet to a json public api representation.
* Maps from a ResultSet to a json public api representation.
*
* @author Gethin James
*/
@@ -62,15 +62,15 @@ public class ResultMapper
}
/**
*
* Turns the results into a CollectionWithPagingInfo
* @param params
* @param results
* @return
* @return CollectionWithPagingInfo<Node>
*/
public CollectionWithPagingInfo<Node> toCollectionWithPagingInfo(SearchQuery searchQuery, ResultSet results)
{
SearchContext context = null;
Long totalItems = results.getNumberFound();
Integer total = null;
List<Node> noderesults = new ArrayList();
Map<String, UserInfo> mapUserInfo = new HashMap<>(10);
@@ -89,20 +89,54 @@ public class ResultMapper
}
});
Integer total = Integer.valueOf(totalItems.intValue());
int skip = searchQuery.getPaging()==null?0:searchQuery.getPaging().getSkipCount();
SolrJSONResultSet solrResultSet = findSolrResultSet(results);
SolrJSONResultSet jsonResultSet = findJsonResults(results);
if (jsonResultSet != null)
if (solrResultSet != null)
{
if (jsonResultSet.getLastIndexedTxId() > 0)
//We used Solr for this query
context = setSearchContext(solrResultSet);
total = setTotal(solrResultSet);
}
else
{
//This probably wasn't solr
if (!results.hasMore())
{
context = new SearchContext(jsonResultSet.getLastIndexedTxId());
//If there are no more results then we are confident that the number found is correct
//otherwise we are not confident enough that its accurate
total = setTotal(results);
}
}
return CollectionWithPagingInfo.asPaged(searchQuery.getPaging(), noderesults, noderesults.size() + skip < total, total, null, context);
return CollectionWithPagingInfo.asPaged(searchQuery.getPaging(), noderesults, results.hasMore(), total, null, context);
}
/**
* Sets the total number found.
* @param results
* @return An integer total
*/
public Integer setTotal(ResultSet results)
{
Long totalItems = results.getNumberFound();
Integer total = totalItems.intValue();
return total;
}
/**
* Uses the results from Solr to set the Search Context
* @param SolrJSONResultSet
* @return SearchContext
*/
protected SearchContext setSearchContext(SolrJSONResultSet solrResultSet)
{
SearchContext context = null;
if (solrResultSet.getLastIndexedTxId() > 0)
{
context = new SearchContext(solrResultSet.getLastIndexedTxId());
}
return context;
}
/**
@@ -110,7 +144,7 @@ public class ResultMapper
* @param results
* @return
*/
protected SolrJSONResultSet findJsonResults(ResultSet results)
protected SolrJSONResultSet findSolrResultSet(ResultSet results)
{
//This may get more complicated if the results are wrapped in another ResultSet class
if (results instanceof SolrJSONResultSet)
@@ -120,7 +154,7 @@ public class ResultMapper
/**
if (results instanceof PagingLuceneResultSet)
{
return findJsonResults(((PagingLuceneResultSet) results).getWrapped());
return findSolrResultSet(((PagingLuceneResultSet) results).getWrapped());
}
**/
return null;