From 122437e086376bcc6e44cf13ec071825519852c9 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Wed, 2 Nov 2022 10:35:48 +0100 Subject: Propagate targetHits in tokenize --- container-search/src/main/java/com/yahoo/search/yql/YqlParser.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'container-search/src/main/java/com/yahoo/search') 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 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; } -- cgit v1.2.3