Merge pull request #8226 from vespa-engine/bratseth/map-query-model-locale-to-query-property

Map locale to a query property 

2 files changed, 6 insertions, 1 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/query/Model.java b/container-search/src/main/java/com/yahoo/search/query/Model.java
index 28b605fa095..f01951047d0 100644
--- a/container-search/src/main/java/com/yahoo/search/query/Model.java
+++ b/container-search/src/main/java/com/yahoo/search/query/Model.java
@@ -46,6 +46,7 @@ public class Model implements Cloneable {
     public static final String FILTER = "filter";
     public static final String DEFAULT_INDEX = "defaultIndex";
     public static final String LANGUAGE = "language";
+    public static final String LOCALE = "locale";
     public static final String ENCODING = "encoding";
     public static final String SOURCES = "sources";
     public static final String SEARCH_PATH = "searchPath";
@@ -61,6 +62,7 @@ public class Model implements Cloneable {
         argumentType.addField(new FieldDescription(FILTER, "string","filter"));
         argumentType.addField(new FieldDescription(DEFAULT_INDEX, "string", "default-index"));
         argumentType.addField(new FieldDescription(LANGUAGE, "string", "language lang"));
+        argumentType.addField(new FieldDescription(LOCALE, "string", "locale"));
         argumentType.addField(new FieldDescription(ENCODING, "string", "encoding"));
         argumentType.addField(new FieldDescription(SOURCES, "string", "sources search"));
         argumentType.addField(new FieldDescription(SEARCH_PATH, "string", "searchpath"));
@@ -72,7 +74,7 @@ public class Model implements Cloneable {
     public static QueryProfileType getArgumentType() { return argumentType; }
 
     /** The name of the query property used for generating hit count estimate queries. */
-    public static final CompoundName ESTIMATE = new CompoundName("hitcountestimate"); // TODO:Cleanup
+    public static final CompoundName ESTIMATE = new CompoundName("hitcountestimate"); // TODO: Cleanup
 
     private String encoding = null;
     private String queryString = "";
diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
index 9e043bc3dc9..ac0e715abd2 100644
--- a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
+++ b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
@@ -53,6 +53,7 @@ public class QueryProperties extends Properties {
             if (key.last().equals(Model.FILTER)) return model.getFilter();
             if (key.last().equals(Model.DEFAULT_INDEX)) return model.getDefaultIndex();
             if (key.last().equals(Model.LANGUAGE)) return model.getLanguage();
+            if (key.last().equals(Model.LOCALE)) return model.getLocale();
             if (key.last().equals(Model.ENCODING)) return model.getEncoding();
             if (key.last().equals(Model.SOURCES)) return model.getSources();
             if (key.last().equals(Model.SEARCH_PATH)) return model.getSearchPath();
@@ -154,6 +155,8 @@ public class QueryProperties extends Properties {
                     model.setDefaultIndex(asString(value, ""));
                 else if (key.last().equals(Model.LANGUAGE))
                     model.setLanguage(asString(value, ""));
+                else if (key.last().equals(Model.LOCALE))
+                    model.setLocale(asString(value, ""));
                 else if (key.last().equals(Model.ENCODING))
                     model.setEncoding(asString(value,""));
                 else if (key.last().equals(Model.SEARCH_PATH))