X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=database.cc;h=6d62109e73c11e758987c5203839e2ef91aa8291;hb=84480738a5e225c145eeaac5c39bb858f6592e95;hp=e73e210d1071658609f31fbceacbce0b35a13e4e;hpb=17b3c214ea123a0e03c5bfff8fc3826976f5ad64;p=notmuch

diff --git a/database.cc b/database.cc
index e73e210d..6d62109e 100644
--- a/database.cc
+++ b/database.cc
@@ -28,59 +28,24 @@
 
 using namespace std;
 
-#define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
-
-/* Xapian complains if we provide a term longer than this. */
-#define NOTMUCH_MAX_TERM 245
-
-/* These prefix values are specifically chosen to be compatible
- * with sup, (http://sup.rubyforge.org), written by
- * William Morgan <wmorgan-sup@masanjin.net>, and released
- * under the GNU GPL v2.
- */
-
-typedef struct {
-    const char *name;
-    const char *prefix;
-} prefix_t;
-
-prefix_t NORMAL_PREFIX[] = {
-    { "subject", "S" },
-    { "body", "B" },
-    { "from_name", "FN" },
-    { "to_name", "TN" },
-    { "name", "N" },
-    { "attachment", "A" }
-};
-
-prefix_t BOOLEAN_PREFIX[] = {
-    { "type", "K" },
-    { "from_email", "FE" },
-    { "to_email", "TE" },
-    { "email", "E" },
-    { "date", "D" },
-    { "label", "L" },
-    { "source_id", "I" },
-    { "attachment_extension", "O" },
-    { "msgid", "Q" },
-    { "thread", "H" },
-    { "ref", "R" }
-};
-
-static const char *
-find_prefix (const char *name)
+const char *
+notmuch_status_to_string (notmuch_status_t status)
 {
-    unsigned int i;
-
-    for (i = 0; i < ARRAY_SIZE (NORMAL_PREFIX); i++)
-	if (strcmp (name, NORMAL_PREFIX[i].name) == 0)
-	    return NORMAL_PREFIX[i].prefix;
-
-    for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX); i++)
-	if (strcmp (name, BOOLEAN_PREFIX[i].name) == 0)
-	    return BOOLEAN_PREFIX[i].prefix;
-
-    return "";
+    switch (status) {
+    case NOTMUCH_STATUS_SUCCESS:
+	return "No error occurred";
+    case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
+	return "A Xapian exception occurred";
+    case NOTMUCH_STATUS_FILE_NOT_EMAIL:
+	return "File is not an email";
+    case NOTMUCH_STATUS_NULL_POINTER:
+	return "Erroneous NULL pointer";
+    case NOTMUCH_STATUS_TAG_TOO_LONG:
+	return "Tag value is too long";
+    default:
+    case NOTMUCH_STATUS_LAST_STATUS:
+	return "Unknown error status value";
+    }
 }
 
 /* "128 bits of thread-id ought to be enough for anybody" */
@@ -119,6 +84,8 @@ thread_id_generate (thread_id_t *thread_id)
     }
 }
 
+/* XXX: We should drop this function and convert all callers to call
+ * _notmuch_message_add_term instead. */
 static void
 add_term (Xapian::Document doc,
 	  const char *prefix_name,
@@ -130,11 +97,11 @@ add_term (Xapian::Document doc,
     if (value == NULL)
 	return;
 
-    prefix = find_prefix (prefix_name);
+    prefix = _find_prefix (prefix_name);
 
     term = g_strdup_printf ("%s%s", prefix, value);
 
-    if (strlen (term) <= NOTMUCH_MAX_TERM)
+    if (strlen (term) <= NOTMUCH_TERM_MAX)
 	doc.add_term (term);
 
     g_free (term);
@@ -150,7 +117,7 @@ find_messages_by_term (Xapian::Database *db,
     Xapian::PostingIterator i;
     char *term;
 
-    term = g_strdup_printf ("%s%s", find_prefix (prefix_name), value);
+    term = g_strdup_printf ("%s%s", _find_prefix (prefix_name), value);
 
     *begin = db->postlist_begin (term);
 
@@ -166,19 +133,6 @@ find_message_by_docid (Xapian::Database *db, Xapian::docid docid)
     return db->get_document (docid);
 }
 
-Xapian::Document
-find_message_by_message_id (Xapian::Database *db, const char *message_id)
-{
-    Xapian::PostingIterator i, end;
-
-    find_messages_by_term (db, "msgid", message_id, &i, &end);
-
-    if (i != end)
-	return find_message_by_docid (db, *i);
-    else
-	return Xapian::Document ();
-}
-
 static void
 insert_thread_id (GHashTable *thread_ids, Xapian::Document doc)
 {
@@ -202,6 +156,21 @@ insert_thread_id (GHashTable *thread_ids, Xapian::Document doc)
     }
 }
 
+notmuch_message_t *
+notmuch_database_find_message (notmuch_database_t *notmuch,
+			       const char *message_id)
+{
+    Xapian::PostingIterator i, end;
+
+    find_messages_by_term (notmuch->xapian_db,
+			   "msgid", message_id, &i, &end);
+
+    if (i == end)
+	return NULL;
+
+    return _notmuch_message_create (notmuch, notmuch, *i);
+}
+
 /* Return one or more thread_ids, (as a GPtrArray of strings), for the
  * given message based on looking into the database for any messages
  * referenced in parents, and also for any messages in the database
@@ -210,10 +179,11 @@ insert_thread_id (GHashTable *thread_ids, Xapian::Document doc)
  * Caller should free all strings in the array and the array itself,
  * (g_ptr_array_free) when done. */
 static GPtrArray *
-find_thread_ids (Xapian::Database *db,
+find_thread_ids (notmuch_database_t *notmuch,
 		 GPtrArray *parents,
 		 const char *message_id)
 {
+    Xapian::WritableDatabase *db = notmuch->xapian_db;
     Xapian::PostingIterator child, children_end;
     Xapian::Document doc;
     GHashTable *thread_ids;
@@ -232,9 +202,25 @@ find_thread_ids (Xapian::Database *db,
     }
 
     for (i = 0; i < parents->len; i++) {
+	notmuch_message_t *parent;
+	notmuch_thread_ids_t *ids;
+
 	parent_message_id = (char *) g_ptr_array_index (parents, i);
-	doc = find_message_by_message_id (db, parent_message_id);
-	insert_thread_id (thread_ids, doc);
+	parent = notmuch_database_find_message (notmuch, parent_message_id);
+	if (parent == NULL)
+	    continue;
+
+	for (ids = notmuch_message_get_thread_ids (parent);
+	     notmuch_thread_ids_has_more (ids);
+	     notmuch_thread_ids_advance (ids))
+	{
+	    const char *id;
+
+	    id = notmuch_thread_ids_get (ids);
+	    g_hash_table_insert (thread_ids, strdup (id), NULL);
+	}
+
+	notmuch_message_destroy (parent);
     }
 
     result = g_ptr_array_new ();
@@ -552,7 +538,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 	    message_id = NULL;
 	}
 
-	thread_ids = find_thread_ids (db, parents, message_id);
+	thread_ids = find_thread_ids (notmuch, parents, message_id);
 
 	for (i = 0; i < parents->len; i++)
 	    g_free (g_ptr_array_index (parents, i));