sup

commit 74d057c6918f2f26b23f0c8d547eb1342f78db57
parent 63034156a4c964b44a1cba2d097f8a22dffa3e4e
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Tue,  5 Jan 2010 13:00:32 -0800

Merge branch 'xapian-name-email' into next

Diffstat:

1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/lib/sup/xapian_index.rb b/lib/sup/xapian_index.rb
@@ -161,14 +161,15 @@ EOS
 
     subs = HookManager.run("custom-search", :subs => s) || s
     subs = subs.gsub(/\b(to|from):(\S+)\b/) do
-      field, name = $1, $2
-      if(p = ContactManager.contact_for(name))
-        [field, p.email]
-      elsif name == "me"
-        [field, "(" + AccountManager.user_emails.join("||") + ")"]
+      field, value = $1, $2
+      email_field, name_field = %w(email name).map { |x| "#{field}_#{x}" }
+      if(p = ContactManager.contact_for(value))
+        "#{email_field}:#{p.email}"
+      elsif value == "me"
+        '(' + AccountManager.user_emails.map { |e| "#{email_field}:#{e}" }.join(' OR ') + ')'
       else
-        [field, name]
-      end.join(":")
+        "(#{email_field}:#{value} OR #{name_field}:#{value})"
+      end
     end
 
     ## if we see a label:deleted or a label:spam term anywhere in the query
@@ -252,6 +253,8 @@ EOS
       end
     end
 
+    debug "translated query: #{subs.inspect}"
+
     qp = Xapian::QueryParser.new
     qp.database = @xapian
     qp.stemmer = Xapian::Stem.new(STEM_LANGUAGE)
@@ -262,6 +265,8 @@ EOS
     BOOLEAN_PREFIX.each { |k,v| qp.add_boolean_prefix k, v }
     xapian_query = qp.parse_query(subs, Xapian::QueryParser::FLAG_PHRASE|Xapian::QueryParser::FLAG_BOOLEAN|Xapian::QueryParser::FLAG_LOVEHATE|Xapian::QueryParser::FLAG_WILDCARD, PREFIX['body'])
 
+    debug "parsed xapian query: #{xapian_query.description}"
+
     raise ParseError if xapian_query.nil? or xapian_query.empty?
     query[:qobj] = xapian_query
     query[:text] = s