Divide the search method.

droonga · Jun 16, 2013 · e1e8fd1 · e1e8fd1
1 parent f938dea
commit e1e8fd1
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/lib/droonga/plugin/handler_search.rb b/lib/droonga/plugin/handler_search.rb
@@ -38,26 +38,30 @@ def initialize(name)
     command :search
     def search(request)
       queries = request["queries"]
+      outputs = process_queries(queries)
+      post(outputs)
+    end
+
+    def process_queries(queries)
+      return {} unless queries
+      query_sorter = QuerySorter.new
+      queries.each do |name, query|
+        query_sorter.add(name, [query["source"]])
+      end
       outputs = {}
-      if queries
-        query_sorter = QuerySorter.new
-        queries.each do |name, query|
-          query_sorter.add(name, [query["source"]])
-        end
-        results = {}
-        query_sorter.tsort.each do |name|
-          if queries[name]
-            searcher = QuerySearcher.new(@context, queries[name])
-            results[name] = searcher.search(results)
-            outputs[name] = searcher.format if searcher.need_output?
-          elsif @context[name]
-            results[name] = @context[name]
-          else
-            raise UndefinedSourceError.new(name)
-          end
+      results = {}
+      query_sorter.tsort.each do |name|
+        if queries[name]
+          searcher = QuerySearcher.new(@context, queries[name])
+          results[name] = searcher.search(results)
+          outputs[name] = searcher.format if searcher.need_output?
+        elsif @context[name]
+          results[name] = @context[name]
+        else
+          raise UndefinedSourceError.new(name)
         end
       end
-      post(outputs)
+      return outputs
     end
 
     class QuerySorter