Author: ssmiweve Date: 2008-03-28 20:30:12 +0100 (Fri, 28 Mar 2008) New Revision: 6306
Modified: branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java branches/2.16/query-api/src/main/java/no/sesat/search/query/token/TokenPredicate.java Log: svn merge -c6293,6294 http://sesat.no/svn/sesat-kernel/branches/2.16.0 Modified: branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java =================================================================== --- branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java 2008-03-28 19:20:33 UTC (rev 6305) +++ branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java 2008-03-28 19:30:12 UTC (rev 6306) @@ -658,7 +658,7 @@ } // XXX Move out. This code is specific to Norway's mobileYellowGeo mode! - if (getParameter("c").equals("yg")) { + if (null != getParameter("c") && getParameter("c").equals("yg")) { if (getParameter("type").equals("f")) { params.setParameter(new SearchParameter( "qtf_geosearch:center", Modified: branches/2.16/query-api/src/main/java/no/sesat/search/query/token/TokenPredicate.java =================================================================== --- branches/2.16/query-api/src/main/java/no/sesat/search/query/token/TokenPredicate.java 2008-03-28 19:20:33 UTC (rev 6305) +++ branches/2.16/query-api/src/main/java/no/sesat/search/query/token/TokenPredicate.java 2008-03-28 19:30:12 UTC (rev 6306) @@ -24,7 +24,13 @@ import java.util.Set; import org.apache.commons.collections.Predicate; -/** Implementation of org.apache.commons.collections.Predicate for the terms in the Query. +/** A Categorisation of knowledge that attaches itself + * as meta-data to words and groups of words (clauses) within a query. <br/><br/> + * The break down of these categories should roughly follow what is found at + * http://en.wikipedia.org/wiki/Portal:Contents/Categorical_index + * + * <br/><br/> + * Implementation of org.apache.commons.collections.Predicate for the terms in the Query. * Predicates use TokenEvaluators to prove the Predicate's validity to the Query. * * @author <a href="mailto:[EMAIL PROTECTED]">Magnus Eklund</a> _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
