Author: ssmiweve
Date: 2008-09-30 13:21:33 +0200 (Tue, 30 Sep 2008)
New Revision: 6857
Modified:
trunk/generic.sesam/war/src/main/conf/AnalysisRules.xml
trunk/query-api/src/main/java/no/sesat/search/query/analyser/AnalysisRuleFactory.java
Log:
Avoid the intermediate usuage of EvaluatorType.
Modified: trunk/generic.sesam/war/src/main/conf/AnalysisRules.xml
===================================================================
--- trunk/generic.sesam/war/src/main/conf/AnalysisRules.xml 2008-09-30
11:06:15 UTC (rev 6856)
+++ trunk/generic.sesam/war/src/main/conf/AnalysisRules.xml 2008-09-30
11:21:33 UTC (rev 6857)
@@ -10,7 +10,7 @@
Purpose of the document follows.
-->
-<rules evaluators="SOLR,FAST,REGEX,JEP">
+<rules
evaluators="no.sesat.search.query.token.SolrEvaluatorFactory,no.sesat.search.query.token.FastQueryMatchingEvaluatorFactory,no.sesat.search.query.token.RegExpEvaluatorFactory,no.sesat.search.query.token.JepEvaluatorFactory">
<!-- Global predicates -->
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/analyser/AnalysisRuleFactory.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/analyser/AnalysisRuleFactory.java
2008-09-30 11:06:15 UTC (rev 6856)
+++
trunk/query-api/src/main/java/no/sesat/search/query/analyser/AnalysisRuleFactory.java
2008-09-30 11:21:33 UTC (rev 6857)
@@ -143,12 +143,8 @@
// initialise anonymous predicate
final String evaluatorTypes = root.getAttribute("evaluators");
if(null != evaluatorTypes && 0 < evaluatorTypes.length()){
- for(String evaluator : evaluatorTypes.split(",")){
+ for(String factoryName : evaluatorTypes.split(",")){
- final EvaluatorType type =
EvaluatorType.instanceOf(evaluator);
-
- final String factoryName =
type.getEvaluatorFactoryClassName();
-
AbstractEvaluatorFactory.instanceOf(
ContextWrapper.wrap(
AbstractEvaluatorFactory.Context.class,
@@ -162,10 +158,10 @@
}
},
new QueryStringContext() {
- public String getQueryString() {
- return "*";
+ public String getQueryString() {
+ return "*";
+ }
}
- }
));
}
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
