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

Fix for ALF-10627 SOLR: search.query() no longer honours page.maxItems parameter

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31084 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2011-10-10 13:39:22 +00:00
parent 5140758b93
commit 052d824a9e
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
View File

@@ -34,6 +34,7 @@ import org.alfresco.repo.domain.node.NodeDAO;
import org.alfresco.repo.search.impl.lucene.LuceneQueryParserException; import org.alfresco.repo.search.impl.lucene.LuceneQueryParserException;
import org.alfresco.repo.search.impl.lucene.SolrJSONResultSet; import org.alfresco.repo.search.impl.lucene.SolrJSONResultSet;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.search.LimitBy;
import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchParameters.FieldFacet; import org.alfresco.service.cmr.search.SearchParameters.FieldFacet;
@@ -156,14 +157,20 @@ public class SolrQueryHTTPClient
url.append(encoder.encode(searchParameters.getQuery(), "UTF-8")); url.append(encoder.encode(searchParameters.getQuery(), "UTF-8"));
url.append("&wt=").append(encoder.encode("json", "UTF-8")); url.append("&wt=").append(encoder.encode("json", "UTF-8"));
url.append("&fl=").append(encoder.encode("*,score", "UTF-8")); url.append("&fl=").append(encoder.encode("*,score", "UTF-8"));
if (searchParameters.getMaxItems() > 0)
if (searchParameters.getMaxItems() >= 0)
{ {
url.append("&rows=").append(encoder.encode("" + searchParameters.getMaxItems(), "UTF-8")); url.append("&rows=").append(encoder.encode("" + searchParameters.getMaxItems(), "UTF-8"));
} }
else if(searchParameters.getLimitBy() == LimitBy.FINAL_SIZE)
{
url.append("&rows=").append(encoder.encode("" + searchParameters.getLimit(), "UTF-8"));
}
else else
{ {
url.append("&rows=").append(encoder.encode("" + Integer.MAX_VALUE, "UTF-8")); url.append("&rows=").append(encoder.encode("" + Integer.MAX_VALUE, "UTF-8"));
} }
url.append("&df=").append(encoder.encode(searchParameters.getDefaultFieldName(), "UTF-8")); url.append("&df=").append(encoder.encode(searchParameters.getDefaultFieldName(), "UTF-8"));
url.append("&start=").append(encoder.encode("" + searchParameters.getSkipCount(), "UTF-8")); url.append("&start=").append(encoder.encode("" + searchParameters.getSkipCount(), "UTF-8"));