From: William Morgan <wmorgan-sup@masanjin.net>
Date: Sat, 22 Aug 2009 14:17:02 +0000 (-0400)
Subject: Merge branch 'xapian-updates' into next
X-Git-Url: https://git.cworth.org/git?p=sup;a=commitdiff_plain;h=f5d9f2ce214a3f90e9716a8b2dc35dc74ef5a9de

Merge branch 'xapian-updates' into next
---

f5d9f2ce214a3f90e9716a8b2dc35dc74ef5a9de
diff --cc lib/sup/xapian_index.rb
index dbf6643,87a5441..85f6ef0
--- a/lib/sup/xapian_index.rb
+++ b/lib/sup/xapian_index.rb
@@@ -87,12 -92,8 +92,12 @@@ class XapianIndex < BaseInde
        m
    end
  
 +  def add_message m; sync_message m end
 +  def update_message m; sync_message m end
 +  def update_message_state m; sync_message m end
 +
    def sync_message m, opts={}
-     entry = synchronize { @entries[m.id] }
+     entry = synchronize { get_entry m.id }
      snippet = m.snippet
      entry ||= {}
      labels = m.labels
@@@ -114,12 -115,10 +119,10 @@@
        :replytos => (entry[:replytos] || m.replytos),
      }
  
 -    m.labels.each { |l| LabelManager << l }
 +    labels.each { |l| LabelManager << l }
  
      synchronize do
-       index_message m, opts
-       union_threads([m.id] + m.refs + m.replytos)
-       @entries[m.id] = d
+       index_message m, d, opts
      end
      true
    end