droonga/fluent-plugin-droonga at 8009f2f [master] Split parse_condition method into _hash and _array (Groonga-commit) - Groonga - fulltext search engine.

Yoji Shidara	2013-12-24 18:03:27 +0900 (Tue, 24 Dec 2013)

  New Revision: 8009f2fa245286a584a52f95eb8a090dba78bf14
  https://github.com/droonga/fluent-plugin-droonga/commit/8009f2fa245286a584a52f95eb8a090dba78bf14

  Message:
    Split parse_condition method into _hash and _array

  Modified files:
    lib/droonga/searcher.rb

  Modified: lib/droonga/searcher.rb (+62 -54)
===================================================================

--- lib/droonga/searcher.rb    2013-12-24 17:05:03 +0900 (6aaac21)
+++ lib/droonga/searcher.rb    2013-12-24 18:03:27 +0900 (2d023be)
@@ -175,66 +175,74 @@ module Droonga
         when String
           expression.parse(condition, :syntax => :script)
         when Hash
-          options = {}
-          if condition["matchTo"]
-            matchTo = Groonga::Expression.new(context: @request.context)
-            matchTo.define_variable(:domain => source)
-            match_columns = condition["matchTo"]
-            match_columns = match_columns.join(",") if match_columns.is_a?(Array)
-            matchTo.parse(match_columns, :syntax => :script)
-            options[:default_column] = matchTo
-          end
-          if condition["query"]
-            options[:syntax] = :query
-            if condition["defaultOperator"]
-              case condition["defaultOperator"]
-              when "||"
-                options[:default_operator] = Groonga::Operator::OR
-              when "&&"
-                options[:default_operator] = Groonga::Operator::AND
-              when "-"
-                options[:default_operator] = Groonga::Operator::BUT
-              else
-                raise "undefined operator assigned #{condition["default_operator"]}"
-              end
-            end
-            if condition["allowPragma"]
-              options[:allow_pragma] = true
-            end
-            if condition["allowColumn"]
-              options[:allow_column] = true
-            end
-            expression.parse(condition["query"], options)
-          elsif condition["script"]
-            # "script" is ignored when "query" is also assigned.
-            options[:syntax] = :script
-            if condition["allowUpdate"]
-              options[:allow_update] = true
+          parse_condition_hash(source, expression, condition)
+        when Array
+          parse_condition_array(source, expression, condition)
+        else
+          raise "unacceptable object #{condition.inspect} assigned"
+        end
+      end
+
+      def parse_condition_hash(source, expression, condition)
+        options = {}
+        if condition["matchTo"]
+          matchTo = Groonga::Expression.new(context: @request.context)
+          matchTo.define_variable(:domain => source)
+          match_columns = condition["matchTo"]
+          match_columns = match_columns.join(",") if match_columns.is_a?(Array)
+          matchTo.parse(match_columns, :syntax => :script)
+          options[:default_column] = matchTo
+        end
+        if condition["query"]
+          options[:syntax] = :query
+          if condition["defaultOperator"]
+            case condition["defaultOperator"]
+            when "||"
+              options[:default_operator] = Groonga::Operator::OR
+            when "&&"
+              options[:default_operator] = Groonga::Operator::AND
+            when "-"
+              options[:default_operator] = Groonga::Operator::BUT
+            else
+              raise "undefined operator assigned #{condition["default_operator"]}"
             end
-            expression.parse(condition["script"], options)
-          else
-            raise "neither 'query' nor 'script' assigned in #{condition.inspect}"
           end
-        when Array
-          case condition[0]
-          when "||"
-            operator = Groonga::Operator::OR
-          when "&&"
-            operator = Groonga::Operator::AND
-          when "-"
-            operator = Groonga::Operator::BUT
-          else
-            raise "undefined operator assigned #{condition[0]}"
+          if condition["allowPragma"]
+            options[:allow_pragma] = true
           end
-          if condition[1]
-            parse_condition(source, expression, condition[1])
+          if condition["allowColumn"]
+            options[:allow_column] = true
           end
-          condition[2..-1].each do |element|
-            parse_condition(source, expression, element)
-            expression.append_operation(operator, 2)
+          expression.parse(condition["query"], options)
+        elsif condition["script"]
+          # "script" is ignored when "query" is also assigned.
+          options[:syntax] = :script
+          if condition["allowUpdate"]
+            options[:allow_update] = true
           end
+          expression.parse(condition["script"], options)
         else
-          raise "unacceptable object #{condition.inspect} assigned"
+          raise "neither 'query' nor 'script' assigned in #{condition.inspect}"
+        end
+      end
+
+      def parse_condition_array(source, expression, condition)
+        case condition[0]
+        when "||"
+          operator = Groonga::Operator::OR
+        when "&&"
+          operator = Groonga::Operator::AND
+        when "-"
+          operator = Groonga::Operator::BUT
+        else
+          raise "undefined operator assigned #{condition[0]}"
+        end
+        if condition[1]
+          parse_condition(source, expression, condition[1])
+        end
+        condition[2..-1].each do |element|
+          parse_condition(source, expression, element)
+          expression.append_operation(operator, 2)
         end
       end
 
-------------- next part --------------
HTML����������������������������...
Download 


Groonga - fulltext search engine.

[Groonga-commit] droonga/fluent-plugin-droonga at 8009f2f [master] Split parse_condition method into _hash and _array