Author: ssmiweve
Date: 2008-05-01 10:06:03 +0200 (Thu, 01 May 2008)
New Revision: 6567
Modified:
trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/OverturePPCSearchCommand.java
trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/PlatefoodPPCSearchCommand.java
trunk/query-api/src/main/java/no/sesat/search/query/token/TokenPredicate.java
trunk/query-transform-control-spi/src/test/java/no/sesat/search/query/transform/SynonymQueryTransformerTest.java
Log:
SEARCH-4408 - Smarter (automatic) way to have EXACT_ tokenPredicates
Modified:
trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/OverturePPCSearchCommand.java
===================================================================
---
trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/OverturePPCSearchCommand.java
2008-05-01 07:56:33 UTC (rev 6566)
+++
trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/OverturePPCSearchCommand.java
2008-05-01 08:06:03 UTC (rev 6567)
@@ -75,7 +75,7 @@
// could have prevented exact matching in the previous evaluation.
final ReconstructedQuery rq = createQuery(getTransformedQuery());
- top =
rq.getEngine().evaluateQuery(TokenPredicate.Categories.EXACT_PPCTOPLIST,
rq.getQuery());
+ top =
rq.getEngine().evaluateQuery(TokenPredicate.Static.getTokenPredicate("PPCTOPLIST").exactPeer(),
rq.getQuery());
try {
final Document doc = getXmlResult();
Modified:
trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/PlatefoodPPCSearchCommand.java
===================================================================
---
trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/PlatefoodPPCSearchCommand.java
2008-05-01 07:56:33 UTC (rev 6566)
+++
trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/PlatefoodPPCSearchCommand.java
2008-05-01 08:06:03 UTC (rev 6567)
@@ -95,7 +95,7 @@
// TODO smelling of non-sesat business logic here. AND presentation
logic. move out.
top =
rq.getEngine().evaluateQuery(TokenPredicate.Categories.LOAN_TRIGGER,
rq.getQuery());
top |=
rq.getEngine().evaluateQuery(TokenPredicate.Categories.SUDOKU_TRIGGER,
rq.getQuery());
- top &=
rq.getEngine().evaluateQuery(TokenPredicate.Categories.EXACT_PPCTOPLIST,
rq.getQuery());
+ top &=
rq.getEngine().evaluateQuery(TokenPredicate.Static.getTokenPredicate("PPCTOPLIST").exactPeer(),
rq.getQuery());
try {
final Document doc = getXmlResult();
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/token/TokenPredicate.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/token/TokenPredicate.java
2008-05-01 07:56:33 UTC (rev 6566)
+++
trunk/query-api/src/main/java/no/sesat/search/query/token/TokenPredicate.java
2008-05-01 08:06:03 UTC (rev 6567)
@@ -104,7 +104,6 @@
enum Categories implements TokenPredicate {
// Categorical TokenPredicates
- // TODO make ExactFast tokens a separate Type referencing the original
Fast token. SEARCH-4408.
// TODO determine type automatically. skins maybe choose an
alternative type. SEARCH-3540.
/** */
@@ -116,8 +115,6 @@
/** */
CELEBRITY (Type.FAST),
/** */
- EXACT_CELEBRITY (Type.FAST),
- /** */
COMPANYBRANCH (Type.FAST),
/** */
COMPANYBRANCHKEYWORD (Type.FAST),
@@ -128,16 +125,12 @@
/** @todo rename to just COMPANY */
COMPANYENRICHMENT (Type.FAST),
/** */
- EXACT_COMPANYENRICHMENT (Type.FAST),
- /** */
COMPANY_KEYWORD (Type.FAST),
/** */
COMPANY_KEYWORD_RESERVED (Type.FAST),
/** */
BIGCOMPANY (Type.FAST),
/** */
- EXACT_BIGCOMPANY (Type.FAST),
- /** */
DISEASE (Type.FAST),
/** */
ENGLISHWORDS (Type.FAST),
@@ -146,10 +139,6 @@
/** */
GEOGLOBAL (Type.FAST),
/** */
- EXACT_GEOLOCAL (Type.FAST),
- /** */
- EXACT_GEOGLOBAL (Type.FAST),
- /** */
GEO_BOROUGH (Type.FAST),
/** */
GEO_COUNTY (Type.FAST),
@@ -168,52 +157,32 @@
/** */
FOOD (Type.FAST),
/** */
- EXACT_FIRST (Type.FAST),
- /** */
FULLNAME (Type.FAST),
/** */
- EXACT_FULLNAME (Type.FAST),
- /** */
LASTNAME (Type.FAST),
/** */
- EXACT_LAST (Type.FAST),
- /** */
MATERIAL (Type.FAST),
/** @deprecated remove. use MOVIE_TITLE TokenPredicates instead. */
MOVIE (Type.FAST),
- /** @deprecated remove. use EXACT_MOVIE_TITLE TokenPredicates instead.
*/
- EXACT_MOVIE (Type.FAST),
/** */
MOVIE_TITLE(Type.FAST),
/** */
- EXACT_MOVIE_TITLE(Type.FAST),
- /** */
MOVIE_ACTOR(Type.FAST),
/** */
- EXACT_MOVIE_ACTOR(Type.FAST),
- /** */
MOVIE_DIRECTOR(Type.FAST),
/** */
- EXACT_MOVIE_DIRECTOR(Type.FAST),
- /** */
NEWSCASE (Type.FAST),
/** */
NOPICTURE (Type.FAST),
/** */
PICTURE (Type.FAST),
/** */
- EXACT_PICTURE (Type.FAST),
- /** */
PRIOCOMPANYNAME (Type.FAST),
/** */
- EXACT_PRIOCOMPANYNAME (Type.FAST),
- /** */
PRODUCT_BICYCLE (Type.FAST),
/** */
PRODUCT_CAR (Type.FAST),
/** */
- EXACT_PRODUCT_CAR (Type.FAST),
- /** */
PRODUCT_CHILDREN (Type.FAST),
/** */
PRODUCT_CLOTHING (Type.FAST),
@@ -250,53 +219,31 @@
/** */
PROFESSION(Type.FAST),
/** */
- EXACT_PROFESSION(Type.FAST),
- /** */
OCEAN (Type.FAST),
/** */
- EXACT_TOP3 (Type.FAST),
- /** */
- EXACT_PPCTOPLIST (Type.FAST),
- /** */
STOCKMARKETTICKERS (Type.FAST),
/** */
STOCKMARKETFIRMS (Type.FAST),
/** */
- EXACT_STOCKMARKETTICKERS (Type.FAST),
- /** */
- EXACT_STOCKMARKETFIRMS (Type.FAST),
- /** */
STYLE (Type.FAST),
/** */
TNS (Type.FAST),
/** */
- EXACT_TNS (Type.FAST),
- /** */
TVPROGRAM (Type.FAST),
/** */
- EXACT_TVPROGRAM (Type.FAST),
- /** */
TVCHANNEL (Type.FAST),
/** */
TRADEMARK (Type.FAST),
/** */
WIKIPEDIA (Type.FAST),
/** */
- EXACT_WIKI (Type.FAST),
- /** */
ARTIST (Type.FAST),
- EXACT_ARTIST (Type.FAST),
FICTION_CHARACTER (Type.FAST),
- EXACT_FICTION_CHARACTER (Type.FAST),
MOTOR_SPORT (Type.FAST),
- EXACT_MOTOR_SPORT (Type.FAST),
PUBLIC_SERVICE_BROADCASTING (Type.FAST),
- EXACT_PUBLIC_SERVICE_BROADCASTING (Type.FAST),
IMAGES (Type.FAST),
- /** */
- EXACT_IMAGE (Type.FAST),
/** @deprecated FIXME!! What is prisjakt? we do not put specific names
into this list */
PRISJAKT_CATEGORIES_AND_MANUFACTURERS (Type.FAST),
/** @deprecated FIXME!! What is prisjakt? we do not put specific names
into this list */
@@ -314,71 +261,42 @@
/** */
CATALOGUE_MAGIC (Type.REGEX),
/** */
- EXACT_CATALOGUE_MAGIC (Type.REGEX),
- /** */
CLASSIFIED_MAGIC (Type.REGEX),
/** */
- EXACT_CLASSIFIED_MAGIC (Type.REGEX),
- /** */
CULTURE_MAGIC (Type.REGEX),
/** */
MOVIE_MAGIC (Type.REGEX),
/** */
NEWS_MAGIC (Type.REGEX),
/** */
- EXACT_NEWS_MAGIC (Type.REGEX),
- /** */
OCEAN_MAGIC (Type.REGEX),
/** */
PICTURE_MAGIC (Type.REGEX),
/** */
- EXACT_PICTURE_MAGIC (Type.REGEX),
- /** */
VIDEO_MAGIC (Type.REGEX),
/** */
- EXACT_VIDEO_MAGIC (Type.REGEX),
- /** */
RECEIPE_MAGIC (Type.REGEX),
/** */
SKIINFO_MAGIC (Type.REGEX),
/** */
STOCK_MAGIC (Type.REGEX),
/** */
- EXACT_STOCK_MAGIC (Type.REGEX),
- /** */
TV_MAGIC (Type.REGEX),
/** */
- EXACT_TV_MAGIC (Type.REGEX),
- /** */
WEATHER_MAGIC (Type.REGEX),
/** */
- EXACT_WEATHER_MAGIC (Type.REGEX),
- /** */
WEBTV_MAGIC (Type.REGEX),
/** */
- EXACT_WEBTV_MAGIC (Type.REGEX),
- /** */
WHITE_MAGIC (Type.REGEX),
/** */
- EXACT_WHITE_MAGIC (Type.REGEX),
- /** */
WIKIPEDIA_MAGIC (Type.REGEX),
/** */
- EXACT_WIKIPEDIA_MAGIC (Type.REGEX),
- /** */
YELLOW_MAGIC (Type.REGEX),
/** */
- EXACT_YELLOW_MAGIC (Type.REGEX),
- /** */
MAP_MAGIC(Type.REGEX),
/** */
- EXACT_MAP_MAGIC (Type.REGEX),
- /** */
BLOG_MAGIC (Type.REGEX),
- /** */
- EXACT_BLOG_MAGIC (Type.REGEX),
-
// RegExp TokenPredicates -- trigger words/phrases
CATALOGUE_TRIGGER (Type.REGEX),
/** */
Modified:
trunk/query-transform-control-spi/src/test/java/no/sesat/search/query/transform/SynonymQueryTransformerTest.java
===================================================================
---
trunk/query-transform-control-spi/src/test/java/no/sesat/search/query/transform/SynonymQueryTransformerTest.java
2008-05-01 07:56:33 UTC (rev 6566)
+++
trunk/query-transform-control-spi/src/test/java/no/sesat/search/query/transform/SynonymQueryTransformerTest.java
2008-05-01 08:06:03 UTC (rev 6567)
@@ -81,13 +81,13 @@
final Query query = parseQuery(tef);
final Map<Clause,String> trans = applyTransformer(new
SynonymQueryTransformer(config), query,
- TokenPredicate.Categories.EXACT_STOCKMARKETTICKERS.name(),
tefCxt, tef);
+
TokenPredicate.Categories.STOCKMARKETTICKERS.exactPeer().name(), tefCxt, tef);
final QueryBuilder builder = new QueryBuilder(query, trans);
final String result = builder.getQueryString();
LOG.debug("testOneWordExact builder gave " + result);
- if(
query.getFirstLeafClause().getPossiblePredicates().contains(TokenPredicate.Categories.EXACT_STOCKMARKETTICKERS)){
+ if(
query.getFirstLeafClause().getPossiblePredicates().contains(TokenPredicate.Categories.STOCKMARKETTICKERS.exactPeer())){
assertEquals("(sch schibsted)", result);
}else{
assertEquals("sch", result);
@@ -160,7 +160,7 @@
final Query query = parseQuery(tef);
final Map<Clause,String> trans = applyTransformer(new
SynonymQueryTransformer(config), query,
- TokenPredicate.Categories.EXACT_STOCKMARKETTICKERS.name(),
tefCxt, tef);
+
TokenPredicate.Categories.STOCKMARKETTICKERS.exactPeer().name(), tefCxt, tef);
final QueryBuilder builder = new QueryBuilder(query, trans);
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
