doc_id = db->add_document (doc);
} catch (const Xapian::Error &error) {
+ fprintf (stderr, "A Xapian exception occurred creating message: %s\n",
+ error.get_msg().c_str());
+ notmuch->exception_reported = TRUE;
*status_ret = NOTMUCH_PRIVATE_STATUS_XAPIAN_EXCEPTION;
return NULL;
}
db_path = notmuch_database_get_path (message->notmuch);
db_path_len = strlen (db_path);
- if (*s == '/' && strncmp (s, db_path, db_path_len) == 0
- && strlen (s) > db_path_len)
+ if (*s == '/' && strlen (s) > db_path_len
+ && strncmp (s, db_path, db_path_len) == 0)
{
- s += db_path_len + 1;
+ s += db_path_len;
+ while (*s == '/') s++;
+
+ if (!*s)
+ INTERNAL_ERROR ("Message filename was same as db prefix.");
}
message->doc.set_data (s);
notmuch_tags_t *
notmuch_message_get_tags (notmuch_message_t *message)
{
- const char *prefix = _find_prefix ("tag");
Xapian::TermIterator i, end;
- notmuch_tags_t *tags;
- std::string tag;
-
- /* Currently this iteration is written with the assumption that
- * "tag" has a single-character prefix. */
- assert (strlen (prefix) == 1);
-
- tags = _notmuch_tags_create (message);
- if (unlikely (tags == NULL))
- return NULL;
-
- i = message->doc.termlist_begin ();
- end = message->doc.termlist_end ();
-
- i.skip_to (prefix);
-
- while (i != end) {
- tag = *i;
-
- if (tag.empty () || tag[0] != *prefix)
- break;
-
- _notmuch_tags_add_tag (tags, tag.c_str () + 1);
-
- i++;
- }
-
- _notmuch_tags_prepare_iterator (tags);
-
- return tags;
+ i = message->doc.termlist_begin();
+ end = message->doc.termlist_end();
+ return _notmuch_convert_tags(message, i, end);
}
void