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

57138: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56921: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56842: Fix for     MNT-9595    Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery 
         - tag queries are unlimited


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61763 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 20:01:07 +00:00
parent 9da70751d1
commit fdfdc70246

View File

@@ -47,6 +47,7 @@ import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.Path; import org.alfresco.service.cmr.repository.Path;
import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.CategoryService; import org.alfresco.service.cmr.search.CategoryService;
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.ResultSetRow; import org.alfresco.service.cmr.search.ResultSetRow;
import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.cmr.search.SearchParameters;
@@ -208,6 +209,9 @@ public class LuceneCategoryServiceImpl implements CategoryService
searchParameters.addSort("@" + ContentModel.PROP_NAME, true); searchParameters.addSort("@" + ContentModel.PROP_NAME, true);
} }
searchParameters.addStore(categoryRef.getStoreRef()); searchParameters.addStore(categoryRef.getStoreRef());
searchParameters.setLimit(-1);
searchParameters.setMaxItems(Integer.MAX_VALUE);
searchParameters.setLimitBy(LimitBy.UNLIMITED);
resultSet = searcher.query(searchParameters); resultSet = searcher.query(searchParameters);
// Convert from search results to the required Child Assocs // Convert from search results to the required Child Assocs