From fa5cb40ff7ee58802ef6c11aa58e68ba75ad728d Mon Sep 17 00:00:00 2001 From: bdc34 Date: Mon, 7 Feb 2011 15:26:05 +0000 Subject: [PATCH] Fixing error in generation of more link for tabs, list views and search results. NIHVIVO-2050 --- .../controller/TabEntitiesController.java | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabEntitiesController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabEntitiesController.java index 4a7fc2c61..0f3ca13ef 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabEntitiesController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabEntitiesController.java @@ -426,24 +426,7 @@ public void doGet( HttpServletRequest req, HttpServletResponse response ) } 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 @@ -539,7 +522,7 @@ public void doGet( HttpServletRequest req, HttpServletResponse response ) 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="+ 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){ //the selected pages is in the middle of the list of page int startPage = selectedPage - MAX_PAGES / 2;