diff options
39 files changed, 181 insertions, 179 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java index ba2421bf5bb..a99300cfd32 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java @@ -64,9 +64,8 @@ public class Search implements Serializable, ImmutableSearch { // True if this doesn't define a search, just some documents. private boolean documentsOnly = false; - // The stemming setting of this search definition. Default is SHORTEST. - // TODO: Change to Stemming.BEST on Vespa 7 - private Stemming stemming = Stemming.SHORTEST; + // The stemming setting of this search definition. Default is BEST. + private Stemming stemming = Stemming.BEST; // Documents contained in this definition. private SDDocumentType docType; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java index 1e4a4a2a5d2..7b84ab5b873 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java @@ -442,8 +442,7 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer { if (active != null) { return active; } - // assume default: TODO: Change to Stemming.BEST on Vespa 7 - return Stemming.SHORTEST; + return Stemming.BEST; // assume default } private boolean stemming(ImmutableSDField field) { diff --git a/config-model/src/test/derived/advanced/ilscripts.cfg b/config-model/src/test/derived/advanced/ilscripts.cfg index faf39ddc4d9..b78cb892501 100644 --- a/config-model/src/test/derived/advanced/ilscripts.cfg +++ b/config-model/src/test/derived/advanced/ilscripts.cfg @@ -12,9 +12,9 @@ ilscript[].content[] "clear_state | guard { 1 | set_var superdupermod; 2 | set_v ilscript[].content[] "clear_state | guard { 0 | set_var superduperus | set_var superdupereu | set_var superduperasia; input debug_src | lowercase | tokenize normalize | summary debug | index debug | split \";\" | for_each { switch { case \"superduperus\": 10 | set_var superduperus; case \"superdupereu\": 10 | set_var superdupereu; case \"superduperasia\": 10 | set_var superduperasia; } }; }" ilscript[].content[] "clear_state | guard { input location_str | to_pos | zcurve | attribute location_zcurve; }" ilscript[].content[] "clear_state | guard { input title_src | summary mysummary; }" -ilscript[].content[] "clear_state | guard { input product_src | switch { case \"\": \"myweb\" | tokenize stem:\"SHORTEST\" | index product | summary product; default: input product_src | tokenize stem:\"SHORTEST\" | index product | summary product; }; }" -ilscript[].content[] "clear_state | guard { if (input product2_src == \"foo\") { \"bar\" | tokenize stem:\"SHORTEST\" | index product2; } else { \"baz\" | tokenize stem:\"SHORTEST\" | index product2; }; }" -ilscript[].content[] "clear_state | guard { input product3_src | switch { case \"\": \"myweb\" | tokenize stem:\"SHORTEST\" | index product3 | summary product3; default: input product3_src | tokenize stem:\"SHORTEST\" | index product3 | summary product3; }; }" +ilscript[].content[] "clear_state | guard { input product_src | switch { case \"\": \"myweb\" | tokenize stem:\"BEST\" | index product | summary product; default: input product_src | tokenize stem:\"BEST\" | index product | summary product; }; }" +ilscript[].content[] "clear_state | guard { if (input product2_src == \"foo\") { \"bar\" | tokenize stem:\"BEST\" | index product2; } else { \"baz\" | tokenize stem:\"BEST\" | index product2; }; }" +ilscript[].content[] "clear_state | guard { input product3_src | switch { case \"\": \"myweb\" | tokenize stem:\"BEST\" | index product3 | summary product3; default: input product3_src | tokenize stem:\"BEST\" | index product3 | summary product3; }; }" ilscript[].content[] "clear_state | guard { input title_src | tokenize normalize | index title; }" ilscript[].content[] "clear_state | guard { input title_src | summary title_s; }" ilscript[].content[] "input attributes_src | passthrough attributes_src" diff --git a/config-model/src/test/derived/advanced/index-info.cfg b/config-model/src/test/derived/advanced/index-info.cfg index a927e9635a3..07b58814ea3 100644 --- a/config-model/src/test/derived/advanced/index-info.cfg +++ b/config-model/src/test/derived/advanced/index-info.cfg @@ -60,7 +60,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "product" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "product" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "product" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "product2" @@ -68,7 +68,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "product2" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "product2" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "product2" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "product3" @@ -76,7 +76,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "product3" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "product3" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "product3" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "rankfeatures" diff --git a/config-model/src/test/derived/arrays/ilscripts.cfg b/config-model/src/test/derived/arrays/ilscripts.cfg index c48f4a22ce7..0490835db33 100644 --- a/config-model/src/test/derived/arrays/ilscripts.cfg +++ b/config-model/src/test/derived/arrays/ilscripts.cfg @@ -6,8 +6,8 @@ ilscript[].docfield[] "ratings" ilscript[].docfield[] "a" ilscript[].docfield[] "b" ilscript[].docfield[] "c" -ilscript[].content[] "clear_state | guard { input tags | for_each { tokenize normalize stem:\"SHORTEST\" } | summary tags | index tags; }" +ilscript[].content[] "clear_state | guard { input tags | for_each { tokenize normalize stem:\"BEST\" } | summary tags | index tags; }" ilscript[].content[] "clear_state | guard { input ratings | summary ratings | attribute ratings; }" -ilscript[].content[] "clear_state | guard { input a | tokenize normalize stem:\"SHORTEST\" | index a; }" -ilscript[].content[] "clear_state | guard { input b | for_each { tokenize normalize stem:\"SHORTEST\" } | index b | attribute b; }" -ilscript[].content[] "clear_state | guard { input c | for_each { tokenize normalize stem:\"SHORTEST\" } | summary c | index c; }" +ilscript[].content[] "clear_state | guard { input a | tokenize normalize stem:\"BEST\" | index a; }" +ilscript[].content[] "clear_state | guard { input b | for_each { tokenize normalize stem:\"BEST\" } | index b | attribute b; }" +ilscript[].content[] "clear_state | guard { input c | for_each { tokenize normalize stem:\"BEST\" } | summary c | index c; }" diff --git a/config-model/src/test/derived/arrays/index-info.cfg b/config-model/src/test/derived/arrays/index-info.cfg index abd5fef2ba9..b18f1eaf55f 100644 --- a/config-model/src/test/derived/arrays/index-info.cfg +++ b/config-model/src/test/derived/arrays/index-info.cfg @@ -10,7 +10,7 @@ indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "tags" indexinfo[].command[].command "multivalue" indexinfo[].command[].indexname "tags" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "tags" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "tags" @@ -26,7 +26,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "a" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "a" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "a" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "a" @@ -38,7 +38,7 @@ indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "b" indexinfo[].command[].command "multivalue" indexinfo[].command[].indexname "b" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "b" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "b" @@ -50,7 +50,7 @@ indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "c" indexinfo[].command[].command "multivalue" indexinfo[].command[].indexname "c" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "c" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "c" @@ -68,6 +68,6 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "default" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "default" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "default" indexinfo[].command[].command "normalize" diff --git a/config-model/src/test/derived/attributes/ilscripts.cfg b/config-model/src/test/derived/attributes/ilscripts.cfg index 08bf52021d7..536394ab11d 100644 --- a/config-model/src/test/derived/attributes/ilscripts.cfg +++ b/config-model/src/test/derived/attributes/ilscripts.cfg @@ -26,13 +26,13 @@ ilscript[].content[] "clear_state | guard { input a1 | attribute a1 | summary a1 ilscript[].content[] "clear_state | guard { input a2 | attribute a2 | summary a2; }" ilscript[].content[] "clear_state | guard { input a3 | attribute a3 | summary a3; }" ilscript[].content[] "clear_state | guard { input a4 | summary a4; }" -ilscript[].content[] "clear_state | guard { input a5 | tokenize normalize stem:\"SHORTEST\" | attribute a5 | summary a5 | index a5; }" -ilscript[].content[] "clear_state | guard { input a6 | tokenize normalize stem:\"SHORTEST\" | attribute a6 | summary a6 | index a6; }" +ilscript[].content[] "clear_state | guard { input a5 | tokenize normalize stem:\"BEST\" | attribute a5 | summary a5 | index a5; }" +ilscript[].content[] "clear_state | guard { input a6 | tokenize normalize stem:\"BEST\" | attribute a6 | summary a6 | index a6; }" ilscript[].content[] "clear_state | guard { input a7 | summary a7; }" ilscript[].content[] "clear_state | guard { input a8 | summary a8; }" ilscript[].content[] "clear_state | guard { input b1 | attribute b1 | summary b1; }" -ilscript[].content[] "clear_state | guard { input b2 | tokenize normalize stem:\"SHORTEST\" | attribute b2 | summary b2 | index b2; }" -ilscript[].content[] "clear_state | guard { input b3 | tokenize normalize stem:\"SHORTEST\" | attribute b3 | summary b3 | index b3; }" +ilscript[].content[] "clear_state | guard { input b2 | tokenize normalize stem:\"BEST\" | attribute b2 | summary b2 | index b2; }" +ilscript[].content[] "clear_state | guard { input b3 | tokenize normalize stem:\"BEST\" | attribute b3 | summary b3 | index b3; }" ilscript[].content[] "clear_state | guard { input b4 | attribute b4 | summary b4; }" ilscript[].content[] "clear_state | guard { input b5 | summary b5 | attribute b5; }" ilscript[].content[] "clear_state | guard { input b6 | summary b6 | attribute b6; }" diff --git a/config-model/src/test/derived/attributes/index-info.cfg b/config-model/src/test/derived/attributes/index-info.cfg index ef96a1dd310..df33a41b066 100644 --- a/config-model/src/test/derived/attributes/index-info.cfg +++ b/config-model/src/test/derived/attributes/index-info.cfg @@ -22,7 +22,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "a5" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "a5" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "a5" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "a5" @@ -32,7 +32,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "a6" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "a6" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "a6" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "a6" @@ -52,7 +52,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "b2" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "b2" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "b2" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "b2" @@ -62,7 +62,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "b3" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "b3" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "b3" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "b3" @@ -144,7 +144,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "default" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "default" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "default" indexinfo[].command[].command "normalize" indexinfo[].alias[].alias "date" diff --git a/config-model/src/test/derived/combinedattributeandindexsearch/index-info.cfg b/config-model/src/test/derived/combinedattributeandindexsearch/index-info.cfg index 85939113adf..d34b6557e3b 100644 --- a/config-model/src/test/derived/combinedattributeandindexsearch/index-info.cfg +++ b/config-model/src/test/derived/combinedattributeandindexsearch/index-info.cfg @@ -8,7 +8,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "index1" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "index1" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "index1" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "index1" @@ -18,7 +18,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "index2" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "index2" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "index2" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "index2" @@ -42,6 +42,6 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "default" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "default" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "default" indexinfo[].command[].command "normalize" diff --git a/config-model/src/test/derived/complex/ilscripts.cfg b/config-model/src/test/derived/complex/ilscripts.cfg index dfef7058936..f7f6c9dd720 100644 --- a/config-model/src/test/derived/complex/ilscripts.cfg +++ b/config-model/src/test/derived/complex/ilscripts.cfg @@ -23,11 +23,11 @@ ilscript[].docfield[] "combineda" ilscript[].docfield[] "combinedb" ilscript[].docfield[] "category" ilscript[].content[] "clear_state | guard { input title . input category | tokenize | summary exact | index exact; }" -ilscript[].content[] "clear_state | guard { input location | tokenize normalize stem:\"SHORTEST\" | summary woe | index woe; }" +ilscript[].content[] "clear_state | guard { input location | tokenize normalize stem:\"BEST\" | summary woe | index woe; }" ilscript[].content[] "clear_state | guard { input yEaR | to_array | attribute year_arr; }" ilscript[].content[] "clear_state | guard { input yEaR - 1900 | attribute year_sub; }" -ilscript[].content[] "clear_state | guard { input title | tokenize normalize stem:\"SHORTEST\" | index title | summary title; }" -ilscript[].content[] "clear_state | guard { input dyntitle | tokenize normalize stem:\"SHORTEST\" | summary dyntitle; }" +ilscript[].content[] "clear_state | guard { input title | tokenize normalize stem:\"BEST\" | index title | summary title; }" +ilscript[].content[] "clear_state | guard { input dyntitle | tokenize normalize stem:\"BEST\" | summary dyntitle; }" ilscript[].content[] "clear_state | guard { input special1 | tokenize normalize | index special1; }" ilscript[].content[] "clear_state | guard { input special2 | tokenize normalize | index special2; }" ilscript[].content[] "clear_state | guard { input special3 | tokenize normalize | index special3; }" @@ -38,12 +38,12 @@ ilscript[].content[] "clear_state | guard { input fleeting | attribute fleeting; ilscript[].content[] "clear_state | guard { input fleeting2 | attribute fleeting2; }" ilscript[].content[] "clear_state | guard { input foundat | attribute foundat; }" ilscript[].content[] "clear_state | guard { input collapseby | attribute collapseby; }" -ilscript[].content[] "clear_state | guard { input stringfield | tokenize normalize stem:\"SHORTEST\" | summary stringfield | index stringfield; }" -ilscript[].content[] "clear_state | guard { input exactemento | tokenize normalize stem:\"SHORTEST\" | index exactemento; }" -ilscript[].content[] "clear_state | guard { input exactagain | tokenize normalize stem:\"SHORTEST\" | index exactagain; }" +ilscript[].content[] "clear_state | guard { input stringfield | tokenize normalize stem:\"BEST\" | summary stringfield | index stringfield; }" +ilscript[].content[] "clear_state | guard { input exactemento | tokenize normalize stem:\"BEST\" | index exactemento; }" +ilscript[].content[] "clear_state | guard { input exactagain | tokenize normalize stem:\"BEST\" | index exactagain; }" ilscript[].content[] "clear_state | guard { input ts | attribute ts; }" ilscript[].content[] "clear_state | guard { input combineda | attribute combineda; }" -ilscript[].content[] "clear_state | guard { input combinedb | tokenize normalize stem:\"SHORTEST\" | index combinedb; }" +ilscript[].content[] "clear_state | guard { input combinedb | tokenize normalize stem:\"BEST\" | index combinedb; }" ilscript[].content[] "input category | passthrough category" ilscript[].content[] "input location | passthrough location" ilscript[].content[] "input yEaR | passthrough yEaR" diff --git a/config-model/src/test/derived/emptydefault/ilscripts.cfg b/config-model/src/test/derived/emptydefault/ilscripts.cfg index 66dbf01d214..b17920fcaab 100644 --- a/config-model/src/test/derived/emptydefault/ilscripts.cfg +++ b/config-model/src/test/derived/emptydefault/ilscripts.cfg @@ -3,5 +3,5 @@ fieldmatchmaxlength 1000000 ilscript[].doctype "emptydefault" ilscript[].docfield[] "one" ilscript[].docfield[] "two" -ilscript[].content[] "clear_state | guard { input one | tokenize normalize stem:\"SHORTEST\" | index one; }" -ilscript[].content[] "clear_state | guard { input two | tokenize normalize stem:\"SHORTEST\" | index two; }" +ilscript[].content[] "clear_state | guard { input one | tokenize normalize stem:\"BEST\" | index one; }" +ilscript[].content[] "clear_state | guard { input two | tokenize normalize stem:\"BEST\" | index two; }" diff --git a/config-model/src/test/derived/emptydefault/index-info.cfg b/config-model/src/test/derived/emptydefault/index-info.cfg index d773f544abb..fbb4c3ebbea 100644 --- a/config-model/src/test/derived/emptydefault/index-info.cfg +++ b/config-model/src/test/derived/emptydefault/index-info.cfg @@ -8,7 +8,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "one" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "one" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "one" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "one" @@ -18,7 +18,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "two" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "two" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "two" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "two" diff --git a/config-model/src/test/derived/indexinfo_fieldsets/index-info.cfg b/config-model/src/test/derived/indexinfo_fieldsets/index-info.cfg index aad17d1dbf2..3e0bad5e172 100644 --- a/config-model/src/test/derived/indexinfo_fieldsets/index-info.cfg +++ b/config-model/src/test/derived/indexinfo_fieldsets/index-info.cfg @@ -24,7 +24,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nonormalizing1" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "nonormalizing1" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nonormalizing1" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nonormalizing2" @@ -32,7 +32,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nonormalizing2" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "nonormalizing2" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nonormalizing2" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "exact1" @@ -66,7 +66,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nonormalizing" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nonormalizing" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "exact" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "exact" diff --git a/config-model/src/test/derived/indexinfo_lowercase/index-info.cfg b/config-model/src/test/derived/indexinfo_lowercase/index-info.cfg index f78daad6f58..d397e37804c 100644 --- a/config-model/src/test/derived/indexinfo_lowercase/index-info.cfg +++ b/config-model/src/test/derived/indexinfo_lowercase/index-info.cfg @@ -20,7 +20,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nc_index" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "nc_index" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nc_index" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "nc_index" @@ -40,7 +40,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "lc_index" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "lc_index" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "lc_index" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "lc_index" @@ -68,7 +68,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "lc_set2" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "lc_set2" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "lc_set2" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "lc_set3" @@ -84,7 +84,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "lc_set4" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "lc_set4" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "lc_set4" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "lc_set5" @@ -102,7 +102,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "lc_set6" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "lc_set6" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "lc_set6" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "lc_set7" @@ -112,7 +112,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "lc_set7" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "lc_set7" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "lc_set7" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "nc_set1" @@ -128,7 +128,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nc_set2" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nc_set2" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nc_set2" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "nc_set3" @@ -142,7 +142,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nc_set4" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nc_set4" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nc_set4" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "nc_set5" @@ -158,7 +158,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nc_set6" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nc_set6" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nc_set6" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "nc_set7" @@ -168,7 +168,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nc_set7" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nc_set7" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nc_set7" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "nc_set8" @@ -178,7 +178,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nc_set8" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nc_set8" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nc_set8" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "nc_set9" @@ -188,7 +188,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nc_set9" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nc_set9" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nc_set9" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "nc_set10" @@ -214,7 +214,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nc_set12" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nc_set12" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nc_set12" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "nc_set13" @@ -224,7 +224,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nc_set13" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nc_set13" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nc_set13" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "nc_set14" @@ -234,7 +234,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nc_set14" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nc_set14" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nc_set14" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "nc_set15" @@ -244,7 +244,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nc_set15" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nc_set15" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nc_set15" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "nc_set16" @@ -254,7 +254,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nc_set16" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nc_set16" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nc_set16" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "nc_set17" @@ -264,7 +264,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nc_set17" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nc_set17" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nc_set17" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "nc_set18" @@ -274,7 +274,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nc_set18" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nc_set18" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nc_set18" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "nc_set19" @@ -284,6 +284,6 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "nc_set19" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "nc_set19" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "nc_set19" indexinfo[].command[].command "normalize" diff --git a/config-model/src/test/derived/indexschema/index-info.cfg b/config-model/src/test/derived/indexschema/index-info.cfg index 6b05a34f2bd..2ba3a5a99ee 100644 --- a/config-model/src/test/derived/indexschema/index-info.cfg +++ b/config-model/src/test/derived/indexschema/index-info.cfg @@ -8,7 +8,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "sa" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "sa" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "sa" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "sa" @@ -18,7 +18,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "sb" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "sb" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "sb" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "sb" @@ -28,7 +28,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "sc" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "sc" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "sc" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "sc" @@ -38,7 +38,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "sd" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "sd" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "sd" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "sd" @@ -70,7 +70,7 @@ indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "sf" indexinfo[].command[].command "multivalue" indexinfo[].command[].indexname "sf" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "sf" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "sf" @@ -82,7 +82,7 @@ indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "sg" indexinfo[].command[].command "multivalue" indexinfo[].command[].indexname "sg" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "sg" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "sg" @@ -116,7 +116,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "si" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "si" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "si" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "si" @@ -188,7 +188,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "fs9" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "fs9" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "fs9" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "fs9" @@ -198,7 +198,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "f10.text" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "f10.text" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "f10.text" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "f10.text" @@ -266,7 +266,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "fs1" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "fs1" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "fs1" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "fs2" @@ -276,7 +276,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "fs2" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "fs2" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "fs2" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "fs3" @@ -290,7 +290,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "fs4" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "fs4" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "fs4" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "onlyattrib" @@ -320,7 +320,7 @@ indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "gram" indexinfo[].command[].command "index" indexinfo[].command[].indexname "gram" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "gram" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "gram" @@ -348,6 +348,6 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "default" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "default" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "default" indexinfo[].command[].command "normalize" diff --git a/config-model/src/test/derived/indexswitches/ilscripts.cfg b/config-model/src/test/derived/indexswitches/ilscripts.cfg index 078895a8a48..77ac18e3261 100644 --- a/config-model/src/test/derived/indexswitches/ilscripts.cfg +++ b/config-model/src/test/derived/indexswitches/ilscripts.cfg @@ -5,6 +5,6 @@ ilscript[].docfield[] "title" ilscript[].docfield[] "descr" ilscript[].docfield[] "source_src" ilscript[].content[] "clear_state | guard { input source_src | switch { case \"theweb\": input source_src | tokenize normalize | summary source | index source; case \"amg\": input source_src | tokenize normalize | summary source; default: input source_src . \" partner\" | tokenize normalize | summary source | index source; }; }" -ilscript[].content[] "clear_state | guard { input title | tokenize normalize stem:\"SHORTEST\" | summary title | index title; }" -ilscript[].content[] "clear_state | guard { input descr | tokenize normalize stem:\"SHORTEST\" | summary descr | index descr; }" +ilscript[].content[] "clear_state | guard { input title | tokenize normalize stem:\"BEST\" | summary title | index title; }" +ilscript[].content[] "clear_state | guard { input descr | tokenize normalize stem:\"BEST\" | summary descr | index descr; }" ilscript[].content[] "input source_src | passthrough source_src" diff --git a/config-model/src/test/derived/indexswitches/index-info.cfg b/config-model/src/test/derived/indexswitches/index-info.cfg index eec20bdbff6..3af5f311d8b 100644 --- a/config-model/src/test/derived/indexswitches/index-info.cfg +++ b/config-model/src/test/derived/indexswitches/index-info.cfg @@ -8,7 +8,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "title" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "title" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "title" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "title" @@ -18,7 +18,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "descr" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "descr" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "descr" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "descr" @@ -44,6 +44,6 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "default" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "default" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "default" indexinfo[].command[].command "normalize" diff --git a/config-model/src/test/derived/inheritance/ilscripts.cfg b/config-model/src/test/derived/inheritance/ilscripts.cfg index 5856da6992e..91410489de8 100644 --- a/config-model/src/test/derived/inheritance/ilscripts.cfg +++ b/config-model/src/test/derived/inheritance/ilscripts.cfg @@ -9,5 +9,5 @@ ilscript[].docfield[] "onlychild" ilscript[].content[] "clear_state | guard { input onlygrandparent | attribute onlygrandparent; }" ilscript[].content[] "clear_state | guard { input overridden | attribute overridden; }" ilscript[].content[] "clear_state | guard { input onlyfather | summary onlyfather; }" -ilscript[].content[] "clear_state | guard { input onlymother | tokenize normalize stem:\"SHORTEST\" | attribute onlymother | index onlymother; }" -ilscript[].content[] "clear_state | guard { input onlychild | tokenize normalize stem:\"SHORTEST\" | index onlychild; }" +ilscript[].content[] "clear_state | guard { input onlymother | tokenize normalize stem:\"BEST\" | attribute onlymother | index onlymother; }" +ilscript[].content[] "clear_state | guard { input onlychild | tokenize normalize stem:\"BEST\" | index onlychild; }" diff --git a/config-model/src/test/derived/inheritance/index-info.cfg b/config-model/src/test/derived/inheritance/index-info.cfg index fe7bf334fcc..e0be7b7d71f 100644 --- a/config-model/src/test/derived/inheritance/index-info.cfg +++ b/config-model/src/test/derived/inheritance/index-info.cfg @@ -22,7 +22,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "onlymother" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "onlymother" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "onlymother" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "onlymother" @@ -32,7 +32,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "onlychild" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "onlychild" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "onlychild" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "onlychild" diff --git a/config-model/src/test/derived/inheritstruct/index-info.cfg b/config-model/src/test/derived/inheritstruct/index-info.cfg index f0476c4bbb8..e0f3fdb5dde 100644 --- a/config-model/src/test/derived/inheritstruct/index-info.cfg +++ b/config-model/src/test/derived/inheritstruct/index-info.cfg @@ -8,7 +8,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "child_struct_field.my_str" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "child_struct_field.my_str" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "child_struct_field.my_str" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "child_struct_field.my_str" diff --git a/config-model/src/test/derived/music/ilscripts.cfg b/config-model/src/test/derived/music/ilscripts.cfg index bbac0fff10c..7a02d836db5 100644 --- a/config-model/src/test/derived/music/ilscripts.cfg +++ b/config-model/src/test/derived/music/ilscripts.cfg @@ -39,39 +39,39 @@ ilscript[].docfield[] "powermetalvalue" ilscript[].docfield[] "progvalue" ilscript[].content[] "clear_state | guard { input hiphopvalue | split \";\" | attribute hiphopvalue_arr; }" ilscript[].content[] "clear_state | guard { input metalvalue | split \";\" | attribute metalvalue_arr; }" -ilscript[].content[] "clear_state | guard { input bgndata | tokenize normalize stem:\"SHORTEST\" | summary bgndata; }" +ilscript[].content[] "clear_state | guard { input bgndata | tokenize normalize stem:\"BEST\" | summary bgndata; }" ilscript[].content[] "clear_state | guard { input sales | summary sales | attribute sales; }" ilscript[].content[] "clear_state | guard { input pto | summary pto | attribute pto; }" -ilscript[].content[] "clear_state | guard { input keys | tokenize normalize stem:\"SHORTEST\" | index keys; }" +ilscript[].content[] "clear_state | guard { input keys | tokenize normalize stem:\"BEST\" | index keys; }" ilscript[].content[] "clear_state | guard { input mid | summary mid | attribute mid; }" -ilscript[].content[] "clear_state | guard { input ew | tokenize normalize stem:\"SHORTEST\" | summary ew | index ew; }" +ilscript[].content[] "clear_state | guard { input ew | tokenize normalize stem:\"BEST\" | summary ew | index ew; }" ilscript[].content[] "clear_state | guard { input surl | summary surl; }" ilscript[].content[] "clear_state | guard { input userrate | summary userrate; }" ilscript[].content[] "clear_state | guard { input pid | summary pid; }" ilscript[].content[] "clear_state | guard { input weight | summary weight | attribute weight; }" ilscript[].content[] "clear_state | guard { input url | summary url; }" ilscript[].content[] "clear_state | guard { input isbn | summary isbn; }" -ilscript[].content[] "clear_state | guard { input fmt | tokenize normalize stem:\"SHORTEST\" | summary fmt | index fmt; }" +ilscript[].content[] "clear_state | guard { input fmt | tokenize normalize stem:\"BEST\" | summary fmt | index fmt; }" ilscript[].content[] "clear_state | guard { input albumid | summary albumid; }" ilscript[].content[] "clear_state | guard { input disp_song | summary disp_song; }" -ilscript[].content[] "clear_state | guard { input song | tokenize normalize stem:\"SHORTEST\" | summary song | index song; }" +ilscript[].content[] "clear_state | guard { input song | tokenize normalize stem:\"BEST\" | summary song | index song; }" ilscript[].content[] "clear_state | guard { input pfrom | summary pfrom; }" ilscript[].content[] "clear_state | guard { input bgnpfrom | summary bgnpfrom | attribute bgnpfrom; }" -ilscript[].content[] "clear_state | guard { input categories | tokenize normalize stem:\"SHORTEST\" | summary categories | index categories; }" +ilscript[].content[] "clear_state | guard { input categories | tokenize normalize stem:\"BEST\" | summary categories | index categories; }" ilscript[].content[] "clear_state | guard { input data | summary data; }" ilscript[].content[] "clear_state | guard { input numreview | summary numreview; }" ilscript[].content[] "clear_state | guard { input bgnsellers | summary bgnsellers; }" ilscript[].content[] "clear_state | guard { input image | summary image; }" -ilscript[].content[] "clear_state | guard { input artist | tokenize normalize stem:\"SHORTEST\" | summary artist | index artist; }" +ilscript[].content[] "clear_state | guard { input artist | tokenize normalize stem:\"BEST\" | summary artist | index artist; }" ilscript[].content[] "clear_state | guard { input artistspid | summary artistspid; }" -ilscript[].content[] "clear_state | guard { input title | tokenize normalize stem:\"SHORTEST\" | summary title | index title; }" +ilscript[].content[] "clear_state | guard { input title | tokenize normalize stem:\"BEST\" | summary title | index title; }" ilscript[].content[] "clear_state | guard { input newestedition | summary newestedition | attribute newestedition; }" -ilscript[].content[] "clear_state | guard { input bgnpto | tokenize normalize stem:\"SHORTEST\" | summary bgnpto; }" +ilscript[].content[] "clear_state | guard { input bgnpto | tokenize normalize stem:\"BEST\" | summary bgnpto; }" ilscript[].content[] "clear_state | guard { input year | summary year | attribute year; }" ilscript[].content[] "clear_state | guard { input did | summary did | attribute did; }" ilscript[].content[] "clear_state | guard { input scorekey | summary scorekey; }" ilscript[].content[] "clear_state | guard { input cbid | summary cbid | attribute cbid; }" ilscript[].content[] "clear_state | guard { input metalvalue | summary metalvalue; }" ilscript[].content[] "clear_state | guard { input hiphopvalue | summary hiphopvalue; }" -ilscript[].content[] "clear_state | guard { input powermetalvalue | tokenize normalize stem:\"SHORTEST\" | index powermetalvalue | summary powermetalvalue; }" -ilscript[].content[] "clear_state | guard { input progvalue | tokenize normalize stem:\"SHORTEST\" | index progvalue | summary progvalue; }" +ilscript[].content[] "clear_state | guard { input powermetalvalue | tokenize normalize stem:\"BEST\" | index powermetalvalue | summary powermetalvalue; }" +ilscript[].content[] "clear_state | guard { input progvalue | tokenize normalize stem:\"BEST\" | index progvalue | summary progvalue; }" diff --git a/config-model/src/test/derived/music/index-info.cfg b/config-model/src/test/derived/music/index-info.cfg index b9264e81e14..5d4cb8133e5 100644 --- a/config-model/src/test/derived/music/index-info.cfg +++ b/config-model/src/test/derived/music/index-info.cfg @@ -22,7 +22,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "keys" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "keys" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "keys" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "keys" @@ -38,7 +38,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "ew" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "ew" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "ew" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "ew" @@ -66,7 +66,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "fmt" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "fmt" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "fmt" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "fmt" @@ -80,7 +80,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "song" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "song" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "song" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "song" @@ -100,7 +100,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "categories" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "categories" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "categories" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "categories" @@ -122,7 +122,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "artist" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "artist" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "artist" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "artist" @@ -134,7 +134,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "title" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "title" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "title" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "title" @@ -178,7 +178,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "powermetalvalue" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "powermetalvalue" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "powermetalvalue" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "powermetalvalue" @@ -188,7 +188,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "progvalue" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "progvalue" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "progvalue" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "progvalue" @@ -230,6 +230,6 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "default" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "default" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "default" indexinfo[].command[].command "normalize" diff --git a/config-model/src/test/derived/newrank/ilscripts.cfg b/config-model/src/test/derived/newrank/ilscripts.cfg index 6194e66ee33..6986f12f62a 100644 --- a/config-model/src/test/derived/newrank/ilscripts.cfg +++ b/config-model/src/test/derived/newrank/ilscripts.cfg @@ -33,34 +33,34 @@ ilscript[].docfield[] "year" ilscript[].docfield[] "did" ilscript[].docfield[] "scorekey" ilscript[].docfield[] "cbid" -ilscript[].content[] "clear_state | guard { input bgndata | tokenize normalize stem:\"SHORTEST\" | summary bgndata; }" +ilscript[].content[] "clear_state | guard { input bgndata | tokenize normalize stem:\"BEST\" | summary bgndata; }" ilscript[].content[] "clear_state | guard { input sales | summary sales | attribute sales; }" ilscript[].content[] "clear_state | guard { input pto | summary pto | attribute pto; }" -ilscript[].content[] "clear_state | guard { input keys | tokenize normalize stem:\"SHORTEST\" | index keys; }" +ilscript[].content[] "clear_state | guard { input keys | tokenize normalize stem:\"BEST\" | index keys; }" ilscript[].content[] "clear_state | guard { input mid | summary mid | attribute mid; }" -ilscript[].content[] "clear_state | guard { input ew | tokenize normalize stem:\"SHORTEST\" | summary ew | index ew; }" +ilscript[].content[] "clear_state | guard { input ew | tokenize normalize stem:\"BEST\" | summary ew | index ew; }" ilscript[].content[] "clear_state | guard { input surl | summary surl; }" ilscript[].content[] "clear_state | guard { input userrate | summary userrate; }" ilscript[].content[] "clear_state | guard { input pid | summary pid; }" ilscript[].content[] "clear_state | guard { input weight | summary weight | attribute weight; }" ilscript[].content[] "clear_state | guard { input url | summary url; }" ilscript[].content[] "clear_state | guard { input isbn | summary isbn; }" -ilscript[].content[] "clear_state | guard { input fmt | tokenize normalize stem:\"SHORTEST\" | summary fmt | index fmt; }" +ilscript[].content[] "clear_state | guard { input fmt | tokenize normalize stem:\"BEST\" | summary fmt | index fmt; }" ilscript[].content[] "clear_state | guard { input albumid | summary albumid; }" ilscript[].content[] "clear_state | guard { input disp_song | summary disp_song; }" -ilscript[].content[] "clear_state | guard { input song | tokenize normalize stem:\"SHORTEST\" | summary song | index song; }" +ilscript[].content[] "clear_state | guard { input song | tokenize normalize stem:\"BEST\" | summary song | index song; }" ilscript[].content[] "clear_state | guard { input pfrom | summary pfrom; }" ilscript[].content[] "clear_state | guard { input bgnpfrom | summary bgnpfrom | attribute bgnpfrom; }" -ilscript[].content[] "clear_state | guard { input categories | tokenize normalize stem:\"SHORTEST\" | summary categories | index categories; }" +ilscript[].content[] "clear_state | guard { input categories | tokenize normalize stem:\"BEST\" | summary categories | index categories; }" ilscript[].content[] "clear_state | guard { input data | summary data; }" ilscript[].content[] "clear_state | guard { input numreview | summary numreview; }" ilscript[].content[] "clear_state | guard { input bgnsellers | summary bgnsellers; }" ilscript[].content[] "clear_state | guard { input image | summary image; }" -ilscript[].content[] "clear_state | guard { input artist | tokenize normalize stem:\"SHORTEST\" | summary artist | index artist; }" +ilscript[].content[] "clear_state | guard { input artist | tokenize normalize stem:\"BEST\" | summary artist | index artist; }" ilscript[].content[] "clear_state | guard { input artistspid | summary artistspid; }" -ilscript[].content[] "clear_state | guard { input title | tokenize normalize stem:\"SHORTEST\" | summary title | index title; }" +ilscript[].content[] "clear_state | guard { input title | tokenize normalize stem:\"BEST\" | summary title | index title; }" ilscript[].content[] "clear_state | guard { input newestedition | summary newestedition | attribute newestedition; }" -ilscript[].content[] "clear_state | guard { input bgnpto | tokenize normalize stem:\"SHORTEST\" | summary bgnpto; }" +ilscript[].content[] "clear_state | guard { input bgnpto | tokenize normalize stem:\"BEST\" | summary bgnpto; }" ilscript[].content[] "clear_state | guard { input year | summary year | attribute year; }" ilscript[].content[] "clear_state | guard { input did | summary did | attribute did; }" ilscript[].content[] "clear_state | guard { input scorekey | summary scorekey | attribute scorekey; }" diff --git a/config-model/src/test/derived/newrank/index-info.cfg b/config-model/src/test/derived/newrank/index-info.cfg index 26d2b92fd10..96d34ee2548 100644 --- a/config-model/src/test/derived/newrank/index-info.cfg +++ b/config-model/src/test/derived/newrank/index-info.cfg @@ -22,7 +22,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "keys" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "keys" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "keys" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "keys" @@ -38,7 +38,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "ew" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "ew" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "ew" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "ew" @@ -66,7 +66,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "fmt" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "fmt" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "fmt" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "fmt" @@ -80,7 +80,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "song" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "song" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "song" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "song" @@ -100,7 +100,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "categories" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "categories" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "categories" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "categories" @@ -122,7 +122,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "artist" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "artist" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "artist" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "artist" @@ -134,7 +134,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "title" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "title" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "title" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "title" @@ -192,6 +192,6 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "default" indexinfo[].command[].command "plain-tokens" indexinfo[].command[].indexname "default" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "default" indexinfo[].command[].command "normalize" diff --git a/config-model/src/test/derived/orderilscripts/ilscripts.cfg b/config-model/src/test/derived/orderilscripts/ilscripts.cfg index 801c7e4d790..c41939b34d1 100644 --- a/config-model/src/test/derived/orderilscripts/ilscripts.cfg +++ b/config-model/src/test/derived/orderilscripts/ilscripts.cfg @@ -3,4 +3,4 @@ fieldmatchmaxlength 1000000 ilscript[].doctype "orderilscripts" ilscript[].docfield[] "foo" ilscript[].content[] "clear_state | guard { input foo | summary bar; }" -ilscript[].content[] "clear_state | guard { input foo | tokenize normalize stem:\"SHORTEST\" | summary foo | index foo; }" +ilscript[].content[] "clear_state | guard { input foo | tokenize normalize stem:\"BEST\" | summary foo | index foo; }" diff --git a/config-model/src/test/derived/prefixexactattribute/ilscripts.cfg b/config-model/src/test/derived/prefixexactattribute/ilscripts.cfg index 4663ef92fcf..a2ada9792a0 100644 --- a/config-model/src/test/derived/prefixexactattribute/ilscripts.cfg +++ b/config-model/src/test/derived/prefixexactattribute/ilscripts.cfg @@ -6,7 +6,7 @@ ilscript[].docfield[] "attributefield1" ilscript[].docfield[] "attributefield2" ilscript[].docfield[] "indexfield1" ilscript[].docfield[] "indexfield2" -ilscript[].content[] "clear_state | guard { input indexfield0 | tokenize normalize stem:\"SHORTEST\" max-length:79 | index indexfield0; }" +ilscript[].content[] "clear_state | guard { input indexfield0 | tokenize normalize stem:\"BEST\" max-length:79 | index indexfield0; }" ilscript[].content[] "clear_state | guard { input attributefield1 | attribute attributefield1; }" ilscript[].content[] "clear_state | guard { input attributefield2 | attribute attributefield2; }" ilscript[].content[] "clear_state | guard { input indexfield1 | exact | index indexfield1; }" diff --git a/config-model/src/test/derived/prefixexactattribute/index-info.cfg b/config-model/src/test/derived/prefixexactattribute/index-info.cfg index 6429d34c5f9..7a84f0515f8 100644 --- a/config-model/src/test/derived/prefixexactattribute/index-info.cfg +++ b/config-model/src/test/derived/prefixexactattribute/index-info.cfg @@ -8,7 +8,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "indexfield0" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "indexfield0" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "indexfield0" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "indexfield0" diff --git a/config-model/src/test/derived/ranktypes/ilscripts.cfg b/config-model/src/test/derived/ranktypes/ilscripts.cfg index 21fe564c922..9f82e75986c 100644 --- a/config-model/src/test/derived/ranktypes/ilscripts.cfg +++ b/config-model/src/test/derived/ranktypes/ilscripts.cfg @@ -6,7 +6,7 @@ ilscript[].docfield[] "descr" ilscript[].docfield[] "keywords" ilscript[].docfield[] "identity" ilscript[].content[] "clear_state | guard { input identity | tokenize | index identity_literal; }" -ilscript[].content[] "clear_state | guard { input title | tokenize normalize stem:\"SHORTEST\" | summary title | index title; }" -ilscript[].content[] "clear_state | guard { input descr | tokenize normalize stem:\"SHORTEST\" | summary descr | index descr; }" -ilscript[].content[] "clear_state | guard { input keywords | tokenize normalize stem:\"SHORTEST\" | index keywords; }" -ilscript[].content[] "clear_state | guard { input identity | tokenize normalize stem:\"SHORTEST\" | index identity; }" +ilscript[].content[] "clear_state | guard { input title | tokenize normalize stem:\"BEST\" | summary title | index title; }" +ilscript[].content[] "clear_state | guard { input descr | tokenize normalize stem:\"BEST\" | summary descr | index descr; }" +ilscript[].content[] "clear_state | guard { input keywords | tokenize normalize stem:\"BEST\" | index keywords; }" +ilscript[].content[] "clear_state | guard { input identity | tokenize normalize stem:\"BEST\" | index identity; }" diff --git a/config-model/src/test/derived/ranktypes/index-info.cfg b/config-model/src/test/derived/ranktypes/index-info.cfg index 3d4ee9e9239..0b9777ca488 100644 --- a/config-model/src/test/derived/ranktypes/index-info.cfg +++ b/config-model/src/test/derived/ranktypes/index-info.cfg @@ -8,7 +8,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "title" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "title" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "title" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "title" @@ -18,7 +18,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "descr" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "descr" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "descr" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "descr" @@ -28,7 +28,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "keywords" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "keywords" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "keywords" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "keywords" @@ -38,7 +38,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "identity" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "identity" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "identity" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "identity" diff --git a/config-model/src/test/derived/types/index-info.cfg b/config-model/src/test/derived/types/index-info.cfg index 576a95de06f..d6b914e5b1b 100644 --- a/config-model/src/test/derived/types/index-info.cfg +++ b/config-model/src/test/derived/types/index-info.cfg @@ -84,7 +84,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "stringmapfield.key" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "stringmapfield.key" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "stringmapfield.key" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "stringmapfield.key" @@ -94,7 +94,7 @@ indexinfo[].command[].command "index" indexinfo[].command[].indexname "stringmapfield.value" indexinfo[].command[].command "lowercase" indexinfo[].command[].indexname "stringmapfield.value" -indexinfo[].command[].command "stem:SHORTEST" +indexinfo[].command[].command "stem:BEST" indexinfo[].command[].indexname "stringmapfield.value" indexinfo[].command[].command "normalize" indexinfo[].command[].indexname "stringmapfield.value" diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java index a3f3f9cccb2..8ccb1ed969a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java @@ -15,11 +15,13 @@ import static org.junit.Assert.assertEquals; * @author bratseth */ public class CommentTestCase extends SearchDefinitionTestCase { + @Test public void testComments() throws IOException, ParseException { Search search = SearchBuilder.buildFromFile("src/test/examples/comment.sd"); SDField field = search.getConcreteField("a"); - assertEquals("{ input a | tokenize normalize stem:\"SHORTEST\" | summary a | index a; }", + assertEquals("{ input a | tokenize normalize stem:\"BEST\" | summary a | index a; }", field.getIndexingScript().toString()); } + } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java index 8066f41537f..89e551fa789 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java @@ -55,7 +55,7 @@ public class SearchImporterTestCase extends SearchDefinitionTestCase { // First field field=(SDField) document.getField("title"); assertEquals(DataType.STRING,field.getDataType()); - assertEquals("{ input title | tokenize normalize stem:\"SHORTEST\" | summary title | index title; }", field.getIndexingScript().toString()); + assertEquals("{ input title | tokenize normalize stem:\"BEST\" | summary title | index title; }", field.getIndexingScript().toString()); assertTrue(!search.getIndex("default").isPrefix()); assertTrue(search.getIndex("title").isPrefix()); Iterator<String> titleAliases=search.getIndex("title").aliasIterator(); @@ -105,19 +105,19 @@ public class SearchImporterTestCase extends SearchDefinitionTestCase { // Seventh field field= search.getConcreteField("categories"); - assertEquals("{ input categories_src | lowercase | normalize | tokenize normalize stem:\"SHORTEST\" | index categories; }", + assertEquals("{ input categories_src | lowercase | normalize | tokenize normalize stem:\"BEST\" | index categories; }", field.getIndexingScript().toString()); assertTrue(field.isHeader()); // Eight field field= search.getConcreteField("categoriesagain"); - assertEquals("{ input categoriesagain_src | lowercase | normalize | tokenize normalize stem:\"SHORTEST\" | index categoriesagain; }", + assertEquals("{ input categoriesagain_src | lowercase | normalize | tokenize normalize stem:\"BEST\" | index categoriesagain; }", field.getIndexingScript().toString()); assertTrue(field.isHeader()); // Ninth field field= search.getConcreteField("exactemento"); - assertEquals("{ input exactemento_src | lowercase | tokenize normalize stem:\"SHORTEST\" | index exactemento | summary exactemento; }", + assertEquals("{ input exactemento_src | lowercase | tokenize normalize stem:\"BEST\" | index exactemento | summary exactemento; }", field.getIndexingScript().toString()); // Tenth field diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/StemmingSettingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/StemmingSettingTestCase.java index defff99d51e..9b27d338ced 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/StemmingSettingTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/StemmingSettingTestCase.java @@ -42,10 +42,10 @@ public class StemmingSettingTestCase extends SearchDefinitionTestCase { } @Test - public void requireThatStemmingIsDefaultShortest() throws IOException, ParseException { + public void requireThatStemmingIsDefaultBest() throws IOException, ParseException { Search search = SearchBuilder.buildFromFile("src/test/examples/stemmingdefault.sd"); assertNull(search.getConcreteField("my_str").getStemming()); - assertEquals(Stemming.SHORTEST, search.getConcreteField("my_str").getStemming(search)); + assertEquals(Stemming.BEST, search.getConcreteField("my_str").getStemming(search)); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/LiteralBoostTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/LiteralBoostTestCase.java index 21739705e30..be720cbe4dd 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/LiteralBoostTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/LiteralBoostTestCase.java @@ -48,7 +48,7 @@ public class LiteralBoostTestCase extends AbstractExportingTestCase { derived.getAttributeFields(); // TODO: assert content // Check il script addition - assertIndexing(Arrays.asList("clear_state | guard { input a | tokenize normalize stem:\"SHORTEST\" | index a; }", + assertIndexing(Arrays.asList("clear_state | guard { input a | tokenize normalize stem:\"BEST\" | index a; }", "clear_state | guard { input a | tokenize | index a_literal; }"), search); @@ -76,7 +76,7 @@ public class LiteralBoostTestCase extends AbstractExportingTestCase { DerivedConfiguration derived = new DerivedConfiguration(search, rankProfileRegistry, new QueryProfileRegistry(),new ImportedMlModels()); // Check il script addition - assertIndexing(Arrays.asList("clear_state | guard { input a | tokenize normalize stem:\"SHORTEST\" | index a; }", + assertIndexing(Arrays.asList("clear_state | guard { input a | tokenize normalize stem:\"BEST\" | index a; }", "clear_state | guard { input a | tokenize | index a_literal; }"), search); @@ -101,8 +101,8 @@ public class LiteralBoostTestCase extends AbstractExportingTestCase { search = SearchBuilder.buildFromRawSearch(search, rankProfileRegistry, new QueryProfileRegistry()); new DerivedConfiguration(search, rankProfileRegistry, new QueryProfileRegistry(), new ImportedMlModels()); - assertIndexing(Arrays.asList("clear_state | guard { input title | tokenize normalize stem:\"SHORTEST\" | summary title | index title; }", - "clear_state | guard { input body | tokenize normalize stem:\"SHORTEST\" | summary body | index body; }", + assertIndexing(Arrays.asList("clear_state | guard { input title | tokenize normalize stem:\"BEST\" | summary title | index title; }", + "clear_state | guard { input body | tokenize normalize stem:\"BEST\" | summary body | index body; }", "clear_state | guard { input title | tokenize | index title_literal; }", "clear_state | guard { input body | tokenize | index body_literal; }"), search); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/OrderIlscriptsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/OrderIlscriptsTestCase.java index b678c407cf9..428522d3e05 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/OrderIlscriptsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/OrderIlscriptsTestCase.java @@ -7,11 +7,13 @@ import org.junit.Test; import java.io.IOException; /** - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge */ public class OrderIlscriptsTestCase extends AbstractExportingTestCase { + @Test public void testOrderIlscripts() throws IOException, ParseException { assertCorrectDeriving("orderilscripts"); } + } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingScriptRewriterTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingScriptRewriterTestCase.java index e078d91f248..d313c2391fd 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingScriptRewriterTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingScriptRewriterTestCase.java @@ -46,12 +46,12 @@ public class IndexingScriptRewriterTestCase extends SearchDefinitionTestCase { public void testDynamicSummaryRewriting() { SDField field = createField("test", DataType.STRING, "{ summary }"); field.addSummaryField(createDynamicSummaryField(field, "dyn")); - assertIndexingScript("{ input test | tokenize normalize stem:\"SHORTEST\" | summary dyn; }", field); + assertIndexingScript("{ input test | tokenize normalize stem:\"BEST\" | summary dyn; }", field); } @Test public void testSummaryRewritingWithIndexing() { - assertIndexingScript("{ input test | tokenize normalize stem:\"SHORTEST\" | summary test | index test; }", + assertIndexingScript("{ input test | tokenize normalize stem:\"BEST\" | summary test | index test; }", createField("test", DataType.STRING, "{ summary | index }")); } @@ -62,7 +62,7 @@ public class IndexingScriptRewriterTestCase extends SearchDefinitionTestCase { field.addSummaryField(createStaticSummaryField(field, "test")); field.addSummaryField(createStaticSummaryField(field, "other")); field.addSummaryField(createDynamicSummaryField(field, "dyn2")); - assertIndexingScript("{ input test | tokenize normalize stem:\"SHORTEST\" | summary dyn | summary dyn2 | summary other | " + + assertIndexingScript("{ input test | tokenize normalize stem:\"BEST\" | summary dyn | summary dyn2 | summary other | " + "summary test | index test; }", field); } @@ -89,7 +89,7 @@ public class IndexingScriptRewriterTestCase extends SearchDefinitionTestCase { public void requireThatOutputDefaultsToCurrentField() { assertIndexingScript("{ input test | attribute test; }", createField("test", DataType.STRING, "{ attribute; }")); - assertIndexingScript("{ input test | tokenize normalize stem:\"SHORTEST\" | index test; }", + assertIndexingScript("{ input test | tokenize normalize stem:\"BEST\" | index test; }", createField("test", DataType.STRING, "{ index; }")); assertIndexingScript("{ input test | summary test; }", createField("test", DataType.STRING, "{ summary; }")); @@ -97,7 +97,7 @@ public class IndexingScriptRewriterTestCase extends SearchDefinitionTestCase { @Test public void testTokenizeComparisonDisregardsConfig() { - assertIndexingScript("{ input test | tokenize normalize stem:\"SHORTEST\" | summary test | index test; }", + assertIndexingScript("{ input test | tokenize normalize stem:\"BEST\" | summary test | index test; }", createField("test", DataType.STRING, "{ summary | tokenize | index; }")); } @@ -106,18 +106,18 @@ public class IndexingScriptRewriterTestCase extends SearchDefinitionTestCase { assertIndexing(Arrays.asList("clear_state | guard { input access | attribute access; }", "clear_state | guard { input category | split \";\" | attribute category_arr; }", "clear_state | guard { input category | tokenize | index category; }", - "clear_state | guard { input categories_src | lowercase | normalize | tokenize normalize stem:\"SHORTEST\" | index categories; }", - "clear_state | guard { input categoriesagain_src | lowercase | normalize | tokenize normalize stem:\"SHORTEST\" | index categoriesagain; }", - "clear_state | guard { input chatter | tokenize normalize stem:\"SHORTEST\" | index chatter; }", - "clear_state | guard { input description | tokenize normalize stem:\"SHORTEST\" | summary description | summary dyndesc | index description; }", - "clear_state | guard { input exactemento_src | lowercase | tokenize normalize stem:\"SHORTEST\" | index exactemento | summary exactemento; }", - "clear_state | guard { input longdesc | tokenize normalize stem:\"SHORTEST\" | summary dyndesc2 | summary dynlong | summary longdesc | summary longstat; }", + "clear_state | guard { input categories_src | lowercase | normalize | tokenize normalize stem:\"BEST\" | index categories; }", + "clear_state | guard { input categoriesagain_src | lowercase | normalize | tokenize normalize stem:\"BEST\" | index categoriesagain; }", + "clear_state | guard { input chatter | tokenize normalize stem:\"BEST\" | index chatter; }", + "clear_state | guard { input description | tokenize normalize stem:\"BEST\" | summary description | summary dyndesc | index description; }", + "clear_state | guard { input exactemento_src | lowercase | tokenize normalize stem:\"BEST\" | index exactemento | summary exactemento; }", + "clear_state | guard { input longdesc | tokenize normalize stem:\"BEST\" | summary dyndesc2 | summary dynlong | summary longdesc | summary longstat; }", "clear_state | guard { input measurement | attribute measurement | summary measurement; }", "clear_state | guard { input measurement | to_array | attribute measurement_arr; }", "clear_state | guard { input popularity | attribute popularity; }", "clear_state | guard { input popularity * input measurement | attribute popsiness; }", "clear_state | guard { input smallattribute | attribute smallattribute; }", - "clear_state | guard { input title | tokenize normalize stem:\"SHORTEST\" | summary title | index title; }", + "clear_state | guard { input title | tokenize normalize stem:\"BEST\" | summary title | index title; }", "clear_state | guard { input title . \" \" . input category | tokenize | summary exact | index exact; }"), SearchBuilder.buildFromFile("src/test/examples/simple.sd")); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValidationTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValidationTestCase.java index df323ddfe09..ad801ed50ab 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValidationTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValidationTestCase.java @@ -63,8 +63,8 @@ public class IndexingValidationTestCase extends AbstractExportingTestCase { @Test public void testExtraField() throws IOException, ParseException { assertIndexing( - Arrays.asList("clear_state | guard { input my_index | tokenize normalize stem:\"SHORTEST\" | index my_index | summary my_index }", - "clear_state | guard { input my_input | tokenize normalize stem:\"SHORTEST\" | index my_extra | summary my_extra }"), + Arrays.asList("clear_state | guard { input my_index | tokenize normalize stem:\"BEST\" | index my_index | summary my_index }", + "clear_state | guard { input my_input | tokenize normalize stem:\"BEST\" | index my_extra | summary my_extra }"), SearchBuilder.buildFromFile("src/test/examples/indexing_extra.sd")); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidatorTest.java index 339f8514f9f..43db1c65d37 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidatorTest.java @@ -48,7 +48,7 @@ public class DocumentDatabaseChangeValidatorTest { newRefeedAction("indexing-change", ValidationOverrides.empty, "Field 'f2' changed: add index aspect, indexing script: '{ input f2 | summary f2; }' -> " + - "'{ input f2 | tokenize normalize stem:\"SHORTEST\" | index f2 | summary f2; }'", Instant.now()), + "'{ input f2 | tokenize normalize stem:\"BEST\" | index f2 | summary f2; }'", Instant.now()), newRefeedAction("field-type-change", ValidationOverrides.empty, "Field 'f3' changed: data type: 'int' -> 'string'", Instant.now()))); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java index 3fe3c27a648..7a5b235737a 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java @@ -66,7 +66,7 @@ public class IndexingScriptChangeValidatorTest { FIELD + " { indexing: index | summary }"). assertValidation(expectedAction("add index aspect", "{ input f1 | summary f1; }", - "{ input f1 | tokenize normalize stem:\"SHORTEST\" | index f1 | summary f1; }")); + "{ input f1 | tokenize normalize stem:\"BEST\" | index f1 | summary f1; }")); } @Test @@ -74,7 +74,7 @@ public class IndexingScriptChangeValidatorTest { new Fixture(FIELD + " { indexing: index | summary }", FIELD + " { indexing: summary }"). assertValidation(expectedAction("remove index aspect", - "{ input f1 | tokenize normalize stem:\"SHORTEST\" | index f1 | summary f1; }", + "{ input f1 | tokenize normalize stem:\"BEST\" | index f1 | summary f1; }", "{ input f1 | summary f1; }")); } @@ -82,8 +82,8 @@ public class IndexingScriptChangeValidatorTest { public void requireThatChangingStemmingRequireRefeed() throws Exception { new Fixture(FIELD + " { indexing: index }", FIELD + " { indexing: index \n stemming: none }"). - assertValidation(expectedAction("stemming: 'shortest' -> 'none'", - "{ input f1 | tokenize normalize stem:\"SHORTEST\" | index f1; }", + assertValidation(expectedAction("stemming: 'best' -> 'none'", + "{ input f1 | tokenize normalize stem:\"BEST\" | index f1; }", "{ input f1 | tokenize normalize | index f1; }")); } @@ -92,8 +92,8 @@ public class IndexingScriptChangeValidatorTest { new Fixture(FIELD + " { indexing: index }", FIELD + " { indexing: index \n normalizing: none }"). assertValidation(expectedAction("normalizing: 'ACCENT' -> 'NONE'", - "{ input f1 | tokenize normalize stem:\"SHORTEST\" | index f1; }", - "{ input f1 | tokenize stem:\"SHORTEST\" | index f1; }")); + "{ input f1 | tokenize normalize stem:\"BEST\" | index f1; }", + "{ input f1 | tokenize stem:\"BEST\" | index f1; }")); } @Test @@ -111,19 +111,19 @@ public class IndexingScriptChangeValidatorTest { FIELD + " { indexing: summary \n summary: dynamic }"). assertValidation(expectedAction("summary field 'f1' transform: 'none' -> 'dynamicteaser'", "{ input f1 | summary f1; }", - "{ input f1 | tokenize normalize stem:\"SHORTEST\" | summary f1; }")); + "{ input f1 | tokenize normalize stem:\"BEST\" | summary f1; }")); } @Test public void requireThatMultipleChangesRequireRefeed() throws Exception { new Fixture(FIELD + " { indexing: index } " + FIELD_F2 + " { indexing: index }", FIELD + " { indexing: index \n stemming: none } " + FIELD_F2 + " { indexing: index \n normalizing: none }"). - assertValidation(Arrays.asList(expectedAction("f1", "stemming: 'shortest' -> 'none'", - "{ input f1 | tokenize normalize stem:\"SHORTEST\" | index f1; }", + assertValidation(Arrays.asList(expectedAction("f1", "stemming: 'best' -> 'none'", + "{ input f1 | tokenize normalize stem:\"BEST\" | index f1; }", "{ input f1 | tokenize normalize | index f1; }"), expectedAction("f2", "normalizing: 'ACCENT' -> 'NONE'", - "{ input f2 | tokenize normalize stem:\"SHORTEST\" | index f2; }", - "{ input f2 | tokenize stem:\"SHORTEST\" | index f2; }"))); + "{ input f2 | tokenize normalize stem:\"BEST\" | index f2; }", + "{ input f2 | tokenize stem:\"BEST\" | index f2; }"))); } @Test |