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

Merge r5464 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-24 18:59:50 +00:00
parent 92d83f4ac2
commit 826679b073
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
View file

@ -232,13 +232,15 @@ public class AutocompleteController extends FreeMarkerHttpServlet implements Sea
//if we have a flag/portal query then we add
//it by making a BooelanQuery.
Query flagQuery = makeFlagQuery( portalState );
if( flagQuery != null ){
BooleanQuery boolQuery = new BooleanQuery();
boolQuery.add( query, BooleanClause.Occur.MUST);
boolQuery.add( flagQuery, BooleanClause.Occur.MUST);
query = boolQuery;
}
// RY 7/24/10 Temporarily commenting out for now because we're suddenly getting portal:2
// thrown onto the query. Will need to investigate post-launch of NIHVIVO 1.1.
// Query flagQuery = makeFlagQuery( portalState );
// if( flagQuery != null ){
// BooleanQuery boolQuery = new BooleanQuery();
// boolQuery.add( query, BooleanClause.Occur.MUST);
// boolQuery.add( flagQuery, BooleanClause.Occur.MUST);
// query = boolQuery;
// }
} catch (Exception ex){
throw new SearchException(ex.getMessage());