Author: mickw
Date: 2006-04-10 18:37:59 +0200 (Mon, 10 Apr 2006)
New Revision: 2759
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/PrefixRemoverTransformer.java
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SynonymQueryTransformer.java
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/TvQueryTransformer.java
Log:
SEARCH-390
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/PrefixRemoverTransformer.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/PrefixRemoverTransformer.java
2006-04-10 15:12:14 UTC (rev 2758)
+++
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/PrefixRemoverTransformer.java
2006-04-10 16:37:59 UTC (rev 2759)
@@ -135,7 +135,7 @@
final PrefixRemoverTransformer retValue =
(PrefixRemoverTransformer)super.clone();
retValue.customPrefixes = customPrefixes;
- retValue.prefixes = new ArrayList<String>();
+ retValue.prefixes = prefixes;
retValue.insidePrefixes = new HashSet<TokenPredicate>();
retValue.prefixBuilder = new StringBuilder();
retValue.leafList = new ArrayList<LeafClause>();
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SynonymQueryTransformer.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SynonymQueryTransformer.java
2006-04-10 15:12:14 UTC (rev 2758)
+++
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SynonymQueryTransformer.java
2006-04-10 16:37:59 UTC (rev 2759)
@@ -225,6 +225,7 @@
final SynonymQueryTransformer retValue =
(SynonymQueryTransformer)super.clone();
retValue.predicateNames = predicateNames;
+ retValue.customPredicates = customPredicates;
retValue.matchingPredicates = new HashSet<TokenPredicate>();
retValue.builder = new StringBuilder();
retValue.leafs = new ArrayList<LeafClause>();
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/TvQueryTransformer.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/TvQueryTransformer.java
2006-04-10 15:12:14 UTC (rev 2758)
+++
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/TvQueryTransformer.java
2006-04-10 16:37:59 UTC (rev 2759)
@@ -12,14 +12,16 @@
* TvQueryTransformer is part of no.schibstedsok.front.searchportal.query
*
* @author Ola Marius Sagli <a href="[EMAIL PROTECTED]">ola at schibstedsok</a>
- * @vesrion $Revision$, $Author$, $Date$
+ * @version $Id$
*/
public final class TvQueryTransformer extends AbstractQueryTransformer {
private static final Log LOG = LogFactory.getLog(TvQueryTransformer.class);
private static final int REG_EXP_OPTIONS = Pattern.CASE_INSENSITIVE |
Pattern.UNICODE_CASE;
- private static final Pattern TV_IDAG =
Pattern.compile("på\\s+tv\\s+i\\s*dag$", REG_EXP_OPTIONS);
+ private static final Pattern TV_PATTERNS
+ =
Pattern.compile("((p(å|aa?)\\s+)?tv(\\s+i\\s?dag)?|(tv(-|\\s+))?program(oversikt)?|fjernsyn)(\\s*\\:)?",
+ REG_EXP_OPTIONS);
/**
* Add keywords to query to get better searchresults
@@ -30,7 +32,7 @@
public String getTransformedQuery() {
final String transformedQuery = getContext().getTransformedQuery();
- return TV_IDAG.matcher(transformedQuery).replaceAll("");
+ return TV_PATTERNS.matcher(transformedQuery).replaceAll("");
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
