Author: mickw
Date: 2006-05-04 16:28:51 +0200 (Thu, 04 May 2006)
New Revision: 2857
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/command/AbstractSearchCommand.java
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/PrefixRemoverTransformer.java
Log:
small fixes for infopages
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/command/AbstractSearchCommand.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/command/AbstractSearchCommand.java
2006-05-04 13:47:14 UTC (rev 2856)
+++
trunk/src/java/no/schibstedsok/front/searchportal/command/AbstractSearchCommand.java
2006-05-04 14:28:51 UTC (rev 2857)
@@ -460,8 +460,11 @@
}
}
+ /** returns null when array is null **/
private String getSingleParameter(final String paramName) {
- return ((String[]) parameters.get(paramName))[0];
+ return parameters.get(paramName) != null
+ ? ((String[]) parameters.get(paramName))[0]
+ : null;
}
private Query createQuery(final String queryString) {
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/PrefixRemoverTransformer.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/PrefixRemoverTransformer.java
2006-05-04 13:47:14 UTC (rev 2856)
+++
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/PrefixRemoverTransformer.java
2006-05-04 14:28:51 UTC (rev 2857)
@@ -15,6 +15,7 @@
import no.schibstedsok.front.searchportal.query.PhraseClause;
import no.schibstedsok.front.searchportal.query.token.RegExpEvaluatorFactory;
import no.schibstedsok.front.searchportal.query.token.TokenPredicate;
+import org.apache.log4j.Logger;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Magnus Eklund</a>
@@ -22,6 +23,8 @@
* @version <tt>$Id$</tt>
*/
public final class PrefixRemoverTransformer extends AbstractQueryTransformer {
+
+ private static final Logger LOG =
Logger.getLogger(PrefixRemoverTransformer.class);
private static final Collection<TokenPredicate> DEFAULT_PREFIXES =
Collections.unmodifiableCollection(
Arrays.asList(
@@ -50,6 +53,8 @@
private StringBuilder prefixBuilder = new StringBuilder();
private List<LeafClause> leafList = new ArrayList<LeafClause>();
private RegExpEvaluatorFactory regExpFactory = null;
+
+ private static final String ERR_PREFIX_NOT_FOUND = "No such TokenPredicate
";
protected void visitImpl(final OperationClause clause) {
clause.getFirstClause().accept(this);
@@ -121,7 +126,11 @@
if (customPrefixes == null && prefixes != null && prefixes.size()
> 0) {
final Collection<TokenPredicate> cp = new ArrayList();
for (String tp : prefixes) {
- cp.add(TokenPredicate.valueOf(tp));
+ try{
+ cp.add(TokenPredicate.valueOf(tp));
+ }catch(IllegalArgumentException iae){
+ LOG.error(ERR_PREFIX_NOT_FOUND + tp, iae);
+ }
}
customPrefixes = Collections.unmodifiableCollection(cp);
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
