Author: ssthkjer Date: 2007-03-14 13:28:20 +0100 (Wed, 14 Mar 2007) New Revision: 4575
Modified: trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java Log: https://jira.sesam.no/jira/browse/SEARCH-1827 - Feil p?\195?\165 site: i nyhetss?\195?\184ket Modified: trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java =================================================================== --- trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java 2007-03-14 11:47:14 UTC (rev 4574) +++ trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java 2007-03-14 12:28:20 UTC (rev 4575) @@ -5,6 +5,7 @@ import java.util.LinkedHashMap; import no.schibstedsok.commons.ioc.BaseContext; import no.schibstedsok.commons.ioc.ContextWrapper; +import no.schibstedsok.searchportal.mode.config.FastSearchConfiguration; import no.schibstedsok.searchportal.mode.config.SearchConfiguration; import no.schibstedsok.searchportal.query.AndClause; import no.schibstedsok.searchportal.query.AndNotClause; @@ -803,8 +804,17 @@ // site fields do not accept quotes term = term.replaceAll("\"",""); } - final String fieldAs = fieldFilters.get(field); - filterBuilder.append(" +" + (fieldAs.length() >0 ? fieldAs + ':' + term : term)); + final String fieldAs = fieldFilters.get(field); + + if (getSearchConfiguration() instanceof FastSearchConfiguration) { + final FastSearchConfiguration fsc = (FastSearchConfiguration) getSearchConfiguration(); + if ( "adv".equals(fsc.getFiltertype()) ) + filterBuilder.append(" AND " + (fieldAs.length() >0 ? fieldAs + ':' + term : term)); + else + filterBuilder.append(" +" + (fieldAs.length() >0 ? fieldAs + ':' + term : term)); + } else { + filterBuilder.append(" +" + (fieldAs.length() >0 ? fieldAs + ':' + term : term)); + } } _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
