notmuch_message_get_filename: Support old-style filename storage.

[notmuch] / lib / message.cc

diff --git a/lib/message.cc b/lib/message.cc
index bd1795195b361409b918dc5ffdb7ecdc4c1666f8..0fc54668cb9a362454551d8880bade40b7c6583e 100644 (file)
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -411,7 +411,7 @@ _notmuch_message_add_filename (notmuch_message_t *message,
     if (status)
        return status;
 
-    _notmuch_message_add_term (message, "direntry", direntry);
+    _notmuch_message_add_term (message, "file-direntry", direntry);
 
     talloc_free (local);
 
@@ -421,7 +421,7 @@ _notmuch_message_add_filename (notmuch_message_t *message,
 const char *
 notmuch_message_get_filename (notmuch_message_t *message)
 {
-    const char *prefix = _find_prefix ("direntry");
+    const char *prefix = _find_prefix ("file-direntry");
     int prefix_len = strlen (prefix);
     Xapian::TermIterator i;
     char *direntry, *colon;
@@ -441,7 +441,19 @@ notmuch_message_get_filename (notmuch_message_t *message)
     if (i == message->doc.termlist_end () ||
        strncmp (direntry, prefix, prefix_len))
     {
-       INTERNAL_ERROR ("message with no filename");
+       /* A message document created by an old version of notmuch
+        * (prior to rename support) will have the filename in the
+        * data of the document rather than as a file-direntry term. */
+       const char *data;
+
+       data = message->doc.get_data ().c_str ();
+
+       if (data == NULL)
+           INTERNAL_ERROR ("message with no filename");
+
+       message->filename = talloc_strdup (message, data);
+
+       return message->filename;
     }
 
     direntry += prefix_len;