Author: ssmiweve
Date: 2008-12-09 14:09:11 +0100 (Tue, 09 Dec 2008)
New Revision: 7068
Modified:
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
Log:
Issue SKER5025: (Promote CorrectingFastSearchCommand)
needs to be possible to update the transformedTerms map against a different
query. typically done when getQuery() is also overridden.
Modified:
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
===================================================================
---
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-12-09 12:30:32 UTC (rev 7067)
+++
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-12-09 13:09:11 UTC (rev 7068)
@@ -116,10 +116,9 @@
// Attributes ----------------------------------------------------
- /**
- * The context to work against.
- */
+ /** The context to work against. */
protected transient final Context context;
+ /** Assigned by initialiseQuery(). **/
private transient Query query = null;
private transient TokenEvaluationEngine engine = null;
private transient final QueryTransformerFactory.Context qtfContext;
@@ -238,11 +237,12 @@
}
};
- // initialise the transformed terms
- initialQueryTransformer = new QueryTransformerFactory(qtfContext)
- .getController(bsc.getInitialQueryTransformer());
+ // construct the initialQueryTransformer and then initialise the map
of transformed terms
+ initialQueryTransformer
+ = new
QueryTransformerFactory(qtfContext).getController(bsc.getInitialQueryTransformer());
+
initialQueryTransformer.setContext(queryBuilderContext);
- initialiseTransformedTerms();
+ initialiseTransformedTerms(query);
// construct the queryBuilder
queryBuilder = constructQueryBuilder(cxt, queryBuilderContext);
@@ -273,8 +273,9 @@
}
/** Set (or reset) the transformed terms back to the state before any
queryTransformers were run.
+ * @param query the query that the transformedTerms map will be
constructed from. This should match getQuery()
*/
- protected final void initialiseTransformedTerms(){
+ protected final void initialiseTransformedTerms(final Query query){
initialQueryTransformer.visit(query.getRootClause());
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
