litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2767 Change loop variable test in getClassGroups() from docs.getNumFound() to maxHitCount, since docs.getNumFound() reflects the total number found in the index, not the total returned in docs

Browse source
This commit is contained in:
ryounes 2011-06-24 16:30:22 +00:00
parent 22300a5728
commit 80a00a0251
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrPagedSearchController.java
View file

@ -277,7 +277,7 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
if( wasHtmlRequested ){ if( wasHtmlRequested ){
// Search request includes no classgroup and no type, so add classgroup search refinement links. // Search request includes no classgroup and no type, so add classgroup search refinement links.
if ( !classGroupFilterRequested && !typeFilterRequested ) { if ( !classGroupFilterRequested && !typeFilterRequested ) {
List<VClassGroup> classgroups = getClassGroups(grpDao, docs); List<VClassGroup> classgroups = getClassGroups(grpDao, docs, maxHitCount);
List<VClassGroupSearchLink> classGroupLinks = new ArrayList<VClassGroupSearchLink>(classgroups.size()); List<VClassGroupSearchLink> classGroupLinks = new ArrayList<VClassGroupSearchLink>(classgroups.size());
for (VClassGroup vcg : classgroups) { for (VClassGroup vcg : classgroups) {
if (vcg.getPublicName() != null) { if (vcg.getPublicName() != null) {
@ -340,16 +340,16 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
/** /**
* Get the class groups represented for the individuals in the documents. * Get the class groups represented for the individuals in the documents.
*/ */
private List<VClassGroup> getClassGroups(VClassGroupDao grpDao, SolrDocumentList docs) { private List<VClassGroup> getClassGroups(VClassGroupDao grpDao, SolrDocumentList docs, int maxHitCount) {
LinkedHashMap<String,VClassGroup> grpMap = grpDao.getClassGroupMap(); LinkedHashMap<String,VClassGroup> grpMap = grpDao.getClassGroupMap();
int n = grpMap.size(); int n = grpMap.size();
HashSet<String> classGroupsInHits = new HashSet<String>(n); HashSet<String> classGroupsInHits = new HashSet<String>(n);
int grpsFound = 0; int grpsFound = 0;
long hitCount = docs.getNumFound(); for(int i = 0; i < maxHitCount && n > grpsFound ;i++){
for(int i=0; i<hitCount && n > grpsFound ;i++){
try{ try{
//log.debug("Looking for classgroups from document number " + i);
SolrDocument doc = docs.get(i); SolrDocument doc = docs.get(i);
Collection<Object> grps = doc.getFieldValues(VitroTermNames.CLASSGROUP_URI); Collection<Object> grps = doc.getFieldValues(VitroTermNames.CLASSGROUP_URI);
if (grps != null) { if (grps != null) {