aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-08-17 09:57:44 +0200
committerGitHub <noreply@github.com>2022-08-17 09:57:44 +0200
commit224b13638e794b01c741d5f345b0adfd65f7b66a (patch)
treec4ab5bb92f4ab01f0b6c634c35deedd80568c7fe /container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
parent02d0725e489540eca682c453dbf254fc63992c6a (diff)
parent5f57dc00592552a29cdab9c535ff05b03db08a5b (diff)
Merge branch 'master' into bratseth/defaultIndex-in-state
Diffstat (limited to 'container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java')
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
index ad1e8525b4b..38d09c3ddf4 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
@@ -142,6 +142,10 @@ public abstract class AbstractParser implements CustomParser {
private Item parse(String queryToParse, String filterToParse, Language parsingLanguage,
IndexFacts.Session indexFacts, String defaultIndex, Parsable parsable) {
if (queryToParse == null) return null;
+
+ if (defaultIndexName != null)
+ defaultIndexName = indexFacts.getCanonicName(defaultIndex);
+
tokenize(queryToParse, defaultIndex, indexFacts, parsingLanguage);
if (parsingLanguage == null && parsable != null) {