Nuke the remainings of _notmuch_message_add_thread_id.

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index 3fe12dd50ee65af6d709edc511229a5e9f047e8f..b6c4d07b794eb37ccdb73b68a31c993fc2326be8 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -855,12 +855,11 @@ _notmuch_database_link_message_to_children (notmuch_database_t *notmuch,
  *
  * We first look at 'message_file' and its link-relevant headers
  * (References and In-Reply-To) for message IDs. We also look in the
  *
  * We first look at 'message_file' and its link-relevant headers
  * (References and In-Reply-To) for message IDs. We also look in the

- * database for existing message that reference 'message'.p
+ * database for existing message that reference 'message'.

  *
  *

- * The end result is to call _notmuch_message_add_thread_id with one
- * or more thread IDs to which this message belongs, (including
- * generating a new thread ID if necessary if the message doesn't
- * connect to any existing threads).
+ * The end result is to call _notmuch_message_ensure_thread_id which
+ * generates a new thread ID if the message doesn't connect to any
+ * existing threads.

  */
 static notmuch_status_t
 _notmuch_database_link_message (notmuch_database_t *notmuch,
  */
 static notmuch_status_t
 _notmuch_database_link_message (notmuch_database_t *notmuch,


@@ -1029,3 +1028,46 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 
     return ret;
 }
 
     return ret;
 }

+
+notmuch_tags_t *
+_notmuch_convert_tags (void *ctx, Xapian::TermIterator &i,
+                      Xapian::TermIterator &end)
+{
+    const char *prefix = _find_prefix ("tag");
+    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 (ctx);
+    if (unlikely (tags == NULL))
+       return NULL;
+
+    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;
+}
+
+notmuch_tags_t *
+notmuch_database_get_all_tags (notmuch_database_t *db)
+{
+    Xapian::TermIterator i, end;
+    i = db->xapian_db->allterms_begin();
+    end = db->xapian_db->allterms_end();
+    return _notmuch_convert_tags(db, i, end);
+}