From mboxrd@z Thu Jan 1 00:00:00 1970 From: rlane@club.cc.cmu.edu (Rich Lane) Date: Sat, 20 Jun 2009 13:50:08 -0700 Subject: [sup-talk] [PATCH 09/18] index: revert overeager opts->query rename in each_message_in_thread_for In-Reply-To: <1245531017-9907-9-git-send-email-rlane@club.cc.cmu.edu> References: <1245531017-9907-1-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-2-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-3-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-4-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-5-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-6-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-7-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-8-git-send-email-rlane@club.cc.cmu.edu> <1245531017-9907-9-git-send-email-rlane@club.cc.cmu.edu> Message-ID: <1245531017-9907-10-git-send-email-rlane@club.cc.cmu.edu> --- lib/sup/index.rb | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/sup/index.rb b/lib/sup/index.rb index e3f9e69..080a4ec 100644 --- a/lib/sup/index.rb +++ b/lib/sup/index.rb @@ -280,7 +280,7 @@ EOS ## is found. SAME_SUBJECT_DATE_LIMIT = 7 MAX_CLAUSES = 1000 - def each_message_in_thread_for m, query={} + def each_message_in_thread_for m, opts={} #Redwood::log "Building thread for #{m.id}: #{m.subj}" messages = {} searched = {} @@ -310,7 +310,7 @@ EOS pending = (pending + p1 + p2).uniq end - until pending.empty? || (query[:limit] && messages.size >= query[:limit]) + until pending.empty? || (opts[:limit] && messages.size >= opts[:limit]) q = Ferret::Search::BooleanQuery.new true # this disappeared in newer ferrets... wtf. # q.max_clause_count = 2048 @@ -329,8 +329,8 @@ EOS killed = false @index_mutex.synchronize do @index.search_each(q, :limit => :all) do |docid, score| - break if query[:limit] && messages.size >= query[:limit] - if @index[docid][:label].split(/\s+/).include?("killed") && query[:skip_killed] + break if opts[:limit] && messages.size >= opts[:limit] + if @index[docid][:label].split(/\s+/).include?("killed") && opts[:skip_killed] killed = true break end -- 1.6.0.4