diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-11-02 10:35:48 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-11-02 10:35:48 +0100 |
commit | 122437e086376bcc6e44cf13ec071825519852c9 (patch) | |
tree | 75eb02aaef341b44b01c16e7cb619a3fc352dd43 /container-search/src/main/java | |
parent | 82a57bbed60b624999da93f18eb05746d0ede3f7 (diff) |
Propagate targetHits in tokenize
Diffstat (limited to 'container-search/src/main/java')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/yql/YqlParser.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java index 1203f69dd3c..76ceb60b3d5 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java +++ b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java @@ -132,7 +132,7 @@ public class YqlParser implements Parser { public static final String USER_INPUT_LANGUAGE = "language"; private static final String USER_INPUT_GRAMMAR_RAW = "raw"; private static final String USER_INPUT_GRAMMAR_SEGMENT = "segment"; - private static final String USER_INPUT_GRAMMAR_WEAKAND = "weakAnd"; + private static final Set<String> WEAKAND_GRAMMARS = Set.of("weakAnd", "tokenize"); private static final String USER_INPUT = "userInput"; private static final String USER_QUERY = "userQuery"; private static final String NON_EMPTY = "nonEmpty"; @@ -731,8 +731,9 @@ public class YqlParser implements Parser { } // Set grammar-specific annotations - if (USER_INPUT_GRAMMAR_WEAKAND.equals(grammar) && item instanceof WeakAndItem weakAndItem) { - weakAndItem.setN(getAnnotation(ast, TARGET_HITS, Integer.class, WeakAndItem.defaultN, "'targetHits' (N) for weak and")); + if (WEAKAND_GRAMMARS.contains(grammar) && item instanceof WeakAndItem weakAndItem) { + weakAndItem.setN(getAnnotation(ast, TARGET_HITS, Integer.class, WeakAndItem.defaultN, + "'targetHits' (N) for weak and")); } return item; } |