_notmuch_message_add_filename (notmuch_message_t *message,
const char *filename)
{
- const char *relative, *directory, *basename;
- char *term;
- Xapian::docid directory_id;
notmuch_status_t status;
void *local = talloc_new (message);
+ char *direntry;
if (message->filename) {
talloc_free (message->filename);
if (filename == NULL)
INTERNAL_ERROR ("Message filename cannot be NULL.");
- relative = _notmuch_database_relative_path (message->notmuch, filename);
-
- status = _notmuch_database_split_path (local, relative,
- &directory, &basename);
- if (status)
- return status;
-
- status = _notmuch_database_find_directory_id (message->notmuch, directory,
- &directory_id);
+ status = _notmuch_database_filename_to_direntry (local,
+ message->notmuch,
+ filename, &direntry);
if (status)
return status;
- term = talloc_asprintf (local, "%s%u:%s",
- _find_prefix ("direntry"), directory_id, basename);
-
- message->doc.add_term (term);
+ _notmuch_message_add_term (message, "file-direntry", direntry);
talloc_free (local);
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;
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;