Lucene.Net.QueryParser.Flexible.Standard.StandardQueryParser: Changed default behavior to use the culture of the current thread and time zone of the current system if they are not explicitly set.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/26742100 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/26742100 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/26742100 Branch: refs/heads/api-work Commit: 26742100720f2438714f0172e9c264be018af205 Parents: 5d5c256 Author: Shad Storhaug <[email protected]> Authored: Wed Mar 22 04:21:41 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Wed Mar 22 04:21:41 2017 +0700 ---------------------------------------------------------------------- .../Flexible/Standard/Config/StandardQueryConfigHandler.cs | 2 +- .../Processors/LowercaseExpandedTermsQueryNodeProcessor.cs | 2 +- .../Flexible/Standard/StandardQueryParser.cs | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/26742100/src/Lucene.Net.QueryParser/Flexible/Standard/Config/StandardQueryConfigHandler.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/StandardQueryConfigHandler.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/StandardQueryConfigHandler.cs index e934063..96ceb70 100644 --- a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/StandardQueryConfigHandler.cs +++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/StandardQueryConfigHandler.cs @@ -52,7 +52,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config Set(ConfigurationKeys.ENABLE_POSITION_INCREMENTS, false); //default value 2.4 Set(ConfigurationKeys.FIELD_BOOST_MAP, new LinkedHashMap<string, float?>()); Set(ConfigurationKeys.FUZZY_CONFIG, new FuzzyConfig()); - Set(ConfigurationKeys.LOCALE, CultureInfo.CurrentCulture); + Set(ConfigurationKeys.LOCALE, null); Set(ConfigurationKeys.MULTI_TERM_REWRITE_METHOD, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT); Set(ConfigurationKeys.FIELD_DATE_RESOLUTION_MAP, new HashMap<string, DateTools.Resolution?>()); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/26742100/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/LowercaseExpandedTermsQueryNodeProcessor.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/LowercaseExpandedTermsQueryNodeProcessor.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/LowercaseExpandedTermsQueryNodeProcessor.cs index 9365ce5..9001d3e 100644 --- a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/LowercaseExpandedTermsQueryNodeProcessor.cs +++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/LowercaseExpandedTermsQueryNodeProcessor.cs @@ -58,7 +58,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors CultureInfo locale = GetQueryConfigHandler().Get(ConfigurationKeys.LOCALE); if (locale == null) { - locale = CultureInfo.InvariantCulture; //Locale.getDefault(); + locale = CultureInfo.CurrentCulture; //Locale.getDefault(); } if (node is WildcardQueryNode http://git-wip-us.apache.org/repos/asf/lucenenet/blob/26742100/src/Lucene.Net.QueryParser/Flexible/Standard/StandardQueryParser.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/StandardQueryParser.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/StandardQueryParser.cs index c9d0da6..1940263 100644 --- a/src/Lucene.Net.QueryParser/Flexible/Standard/StandardQueryParser.cs +++ b/src/Lucene.Net.QueryParser/Flexible/Standard/StandardQueryParser.cs @@ -324,7 +324,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard { get { - return QueryConfigHandler.Get(ConfigurationKeys.LOCALE); + var culture = QueryConfigHandler.Get(ConfigurationKeys.LOCALE); + return culture == null ? CultureInfo.CurrentCulture : culture; } set { @@ -336,7 +337,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard { get { - return QueryConfigHandler.Get(ConfigurationKeys.TIMEZONE); + var timeZone = QueryConfigHandler.Get(ConfigurationKeys.TIMEZONE); + return timeZone == null ? TimeZoneInfo.Local : timeZone; } set {
