Merge branch 'speedy-index' into next

diff --git a/lib/sup/index.rb b/lib/sup/index.rb
index f1678fceaa1ace6f4a5c05148df6e260761f8be6..77bc74061f56408c813f524c8a7a10a92334f70d 100644 (file)
--- a/lib/sup/index.rb
+++ b/lib/sup/index.rb
@@ -190,6 +190,11 @@ EOS
     ## flags. this allows messages sent to mailing lists to have their header
     ## updated and to have flags set properly.
     ##
+    ## minor hack: messages in sources with lower ids have priority over
+    ## messages in sources with higher ids. so messages in the inbox will
+    ## override everyone, and messages in the sent box will be overridden
+    ## by everyone else.
+    ##
     ## written in this manner to support previous versions of the index which
     ## did not keep around the entry body. upgrading is thus seamless.
     entry ||= {}
@@ -198,9 +203,10 @@ EOS
     ## if we are a later version of a message, ignore what's in the index,
     ## but merge in the labels.
     if entry[:source_id] && entry[:source_info] && entry[:label] &&
-      ((entry[:source_id] != source_id) || (entry[:source_info] < source_info))
+      ((entry[:source_id].to_i > source_id) || (entry[:source_info].to_i < m.source_info))
       labels = (entry[:label].split(/\s+/).map { |l| l.intern } + m.labels).uniq
       Redwood::log "found updated version of message #{m.id}: #{m.subj}"
+      Redwood::log "previous version was at #{entry[:source_id].inspect}:#{entry[:source_info].inspect}, this version at #{source_id.inspect}:#{m.source_info.inspect}"
       Redwood::log "merged labels are #{labels.inspect} (index #{entry[:label].inspect}, message #{m.labels.inspect})"
       entry = {}
     end