Message(): add 'match' result in text output. Fix is_match to use class, not instance...

[notmuch] / cnotmuch / message.py

diff --git a/cnotmuch/message.py b/cnotmuch/message.py
index 6ae5564795af2f2bbdf5dd5d453b0dc02a575af7..411d84da93b9a5a8006f13a617d5e1fda0056be3 100644 (file)
--- a/cnotmuch/message.py
+++ b/cnotmuch/message.py
@@ -1,3 +1,21 @@
+#    This file is part of cnotmuch.
+#
+#    cnotmuch is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    cnotmuch is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with cnotmuch.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    (C) Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
+#                       Jesse Rosenthal <jrosenthal@jhu.edu>
+        
 from ctypes import c_char_p, c_void_p, c_long, c_bool
 from datetime import date
 from cnotmuch.globals import nmlib, STATUS, NotmuchError, Enum
@@ -609,7 +627,7 @@ class Message(object):
 
     def is_match(self):
         """(Not implemented)"""
-        return self.get_flag(self.FLAG.MATCH)
+        return self.get_flag(Message.FLAG.MATCH)
 
     def __str__(self):
         """A message() is represented by a 1-line summary"""
@@ -698,9 +716,8 @@ class Message(object):
         easy to change to a new format when the format changes."""
 
         format = self.format_message_internal()
-        output = "\n\fmessage{ id:%s depth:%d filename:%s" % (format["id"],
-                                                              indent,
-                                                              format["filename"])
+        output = "\n\fmessage{ id:%s depth:%d match:%d filename:%s" \
+                 % (format['id'], indent, format['match'], format['filename'])
         output += "\n\fheader{"
 
         #Todo: this date is supposed to be cleaned up, as in the index.