diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-01-25 13:23:43 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-01-25 13:23:43 +0100 |
commit | 3078f0cb6c69d94d23f342380f778f233ba369c1 (patch) | |
tree | da5980d5e5fe8fbe0c20ca6c145ba2f446c2cb41 /container-search/src | |
parent | 3a59cd028b3a5352929e49b9cec13396a66e6fb2 (diff) |
Propagate explicit language if set
Diffstat (limited to 'container-search/src')
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java | 2 | ||||
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/query/parser/Parsable.java | 3 |
2 files changed, 2 insertions, 3 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 0a76e5fb939..11206fbb1c1 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 @@ -123,7 +123,7 @@ public abstract class AbstractParser implements CustomParser { if (query != null) { root = parse(query.getQuery(), query.getFilter(), - query.getLanguage(), + query.getExplicitLanguage().orElse(query.getLanguage()), environment.getIndexFacts().newSession(query.getSources(), query.getRestrict()), query.getDefaultIndexName(), query); diff --git a/container-search/src/main/java/com/yahoo/search/query/parser/Parsable.java b/container-search/src/main/java/com/yahoo/search/query/parser/Parsable.java index 80194bcccf4..ba758b27400 100644 --- a/container-search/src/main/java/com/yahoo/search/query/parser/Parsable.java +++ b/container-search/src/main/java/com/yahoo/search/query/parser/Parsable.java @@ -68,8 +68,7 @@ public final class Parsable { } /** - * Returns the language to use when parsing, - * if not decided by the item under parsing. This is never null or UNKNOWN + * Returns the language to use when parsing, or null to decide during parsing. */ public Language getLanguage() { return language; |