Merge branch 'zsh-completion'

[sup] / lib / sup / modes / search-results-mode.rb

diff --git a/lib/sup/modes/search-results-mode.rb b/lib/sup/modes/search-results-mode.rb
index 6f0da2f101fa3f9a14a0ca0aa2cff698ec95ab9b..6fdc58a0c9da1f0df907ce8e29d786a36db9b4d7 100644 (file)
--- a/lib/sup/modes/search-results-mode.rb
+++ b/lib/sup/modes/search-results-mode.rb
@@ -1,17 +1,21 @@
 module Redwood
 
 class SearchResultsMode < ThreadIndexMode
-  def initialize qobj
+  def initialize qobj, qopts = nil
     @qobj = qobj
-    super [], { :qobj => @qobj }
+    @qopts = qopts
+
+    super [], { :qobj => @qobj }.merge(@qopts)
   end
 
   register_keymap do |k|
-    k.add :refine_search, "Refine search", '.'
+    k.add :refine_search, "Refine search", '|'
   end
 
   def refine_search
-    SearchResultsMode.spawn_by_query(@qobj.to_s + " ")
+    query = BufferManager.ask :search, "refine query: ", (@qobj.to_s + " ")
+    return unless query && query !~ /^\s*$/
+    SearchResultsMode.spawn_from_query query
   end
 
   ## a proper is_relevant? method requires some way of asking ferret
@@ -20,14 +24,12 @@ class SearchResultsMode < ThreadIndexMode
   ## the message, and search against it to see if i have > 0 results,
   ## but that seems pretty insane.
 
-  def self.spawn_by_query default=""
-    text = BufferManager.ask :search, "query: ", default
-    return unless text && text !~ /^\s*$/
-
+  def self.spawn_from_query text
     begin
-      qobj = Index.parse_user_query_string text
+      qobj, extraopts = Index.parse_user_query_string(text)
+      return unless qobj
       short_text = text.length < 20 ? text : text[0 ... 20] + "..."
-      mode = SearchResultsMode.new qobj
+      mode = SearchResultsMode.new qobj, extraopts
       BufferManager.spawn "search: \"#{short_text}\"", mode
       mode.load_threads :num => mode.buffer.content_height
     rescue Ferret::QueryParser::QueryParseException => e