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

Fixing error in generation of more link for tabs, list views and search results. NIHVIVO-2050

Browse source
This commit is contained in:
bdc34 2011-02-07 15:26:05 +00:00
parent 7c2de0dbf2
commit fa5cb40ff7
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabEntitiesController.java
View file

@ -427,23 +427,6 @@ public void doGet( HttpServletRequest req, HttpServletResponse response )
typeQuery.add(tabQueries,BooleanClause.Occur.MUST); typeQuery.add(tabQueries,BooleanClause.Occur.MUST);
} }
} }
String flag2Set = tab.getFlag2Set();
if( tab.getFlag2Set() != null && ! tab.getFlag2Set().isEmpty()){
if( flag2Set != null && ! "".equals(flag2Set)){
BooleanQuery flag2Query = new BooleanQuery();
for( String flag2Value : flag2Set.split(",")){
if( flag2Value != null ){
String value = flag2Value.replace(",", "");
if(!value.isEmpty()){
flag2Query.add(new TermQuery(new Term(Entity2LuceneDoc.term.FLAG2,value)),
BooleanClause.Occur.SHOULD);
}
}
}
typeQuery.add(flag2Query, BooleanClause.Occur.MUST);
}
}
} }
//make query for manually linked individuals //make query for manually linked individuals
@ -539,7 +522,7 @@ public void doGet( HttpServletRequest req, HttpServletResponse response )
for(int page = 1; page < requiredPages && page <= MAX_PAGES ; page++ ){ for(int page = 1; page < requiredPages && page <= MAX_PAGES ; page++ ){
records.add( new PageRecord( "page=" + page, Integer.toString(page), Integer.toString(page), selectedPage == page ) ); records.add( new PageRecord( "page=" + page, Integer.toString(page), Integer.toString(page), selectedPage == page ) );
} }
records.add( new PageRecord( "page="+ MAX_PAGES+1, Integer.toString(MAX_PAGES+1), "more...", false)); records.add( new PageRecord( "page="+ (MAX_PAGES+1), Integer.toString(MAX_PAGES+1), "more...", false));
}else if( requiredPages > MAX_PAGES && selectedPage+1 > MAX_PAGES && selectedPage < requiredPages - MAX_PAGES){ }else if( requiredPages > MAX_PAGES && selectedPage+1 > MAX_PAGES && selectedPage < requiredPages - MAX_PAGES){
//the selected pages is in the middle of the list of page //the selected pages is in the middle of the list of page
int startPage = selectedPage - MAX_PAGES / 2; int startPage = selectedPage - MAX_PAGES / 2;