diff options
author | Tim Smith <tsmith@chef.io> | 2019-12-29 18:06:37 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-29 18:06:37 -0800 |
commit | c8bf6efa66ff005ab87ff81c9a857ea0c6c1090e (patch) | |
tree | 3a25409c03ff3ac83f94e6e740145353d3e2c095 /lib/chef_zero/solr/solr_parser.rb | |
parent | 435755ee68c14fd6d6f858e451e7afeee1610e6f (diff) | |
parent | ecad8fee4a946b337e60a4274de2b2c872c9e81b (diff) | |
download | chef-zero-c8bf6efa66ff005ab87ff81c9a857ea0c6c1090e.tar.gz |
Merge pull request #298 from chef/chefstyle
Apply Chefstyle
Diffstat (limited to 'lib/chef_zero/solr/solr_parser.rb')
-rw-r--r-- | lib/chef_zero/solr/solr_parser.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/chef_zero/solr/solr_parser.rb b/lib/chef_zero/solr/solr_parser.rb index 86c232f..8de63e6 100644 --- a/lib/chef_zero/solr/solr_parser.rb +++ b/lib/chef_zero/solr/solr_parser.rb @@ -50,7 +50,7 @@ module ChefZero if @query_string[@index] == '\\' @index += 1 end - @index += 1 if !eof? + @index += 1 unless eof? break if eof? || !peek_term_token end @query_string[start_index..@index - 1] @@ -66,6 +66,7 @@ module ChefZero def peek_term_token return nil if @query_string[@index] =~ /\s/ + op = peek_operator_token !op || op == "-" end @@ -79,6 +80,7 @@ module ChefZero return result end end + nil end @@ -145,13 +147,13 @@ module ChefZero # If it's the start of a range query, build that elsif token == "{" || token == "[" left = next_token - parse_error(left, "Expected left term in range query") if !left + parse_error(left, "Expected left term in range query") unless left to = next_token parse_error(left, "Expected TO in range query") if to != "TO" right = next_token - parse_error(right, "Expected left term in range query") if !right + parse_error(right, "Expected left term in range query") unless right end_range = next_token - parse_error(right, "Expected end range '#{end_range}") if !["}", "]"].include?(end_range) + parse_error(right, "Expected end range '#{end_range}") unless ["}", "]"].include?(end_range) Query::RangeQuery.new(left, right, token == "[", end_range == "]") elsif token == "(" |