From: Carl Worth <cworth@cworth.org>
Date: Thu, 22 Oct 2009 06:23:32 +0000 (-0700)
Subject: Merge branch from fixing up bugs after bisecting.
X-Git-Tag: 0.1~776
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=84480738a5e225c145eeaac5c39bb858f6592e95

Merge branch from fixing up bugs after bisecting.

I'm glad that when I implemented "notmuch restore" I went through the
extra effort to take the code I had written in one sitting into over a
dozen commits. Sure enough, I hadn't tested well enough and had
totally broken "notmuch setup", (segfaults and bogus thread_id
values).

With the little commits I had made, git bisect saved the day, and I
went back to make the fixes right on top of the commits that
introduced the bugs. So now we octopus merge those in.
---

84480738a5e225c145eeaac5c39bb858f6592e95
diff --cc database.cc
index 5049b47e,00b03731,77b2eff2..6d62109e
--- a/database.cc
+++ b/database.cc
@@@@ -133,21 -111,42 -111,44 +133,44 @@@@ find_message_by_docid (Xapian::Databas
       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)
+  {
+      string value_string;
+      const char *value, *id, *comma;
+  
+      value_string = doc.get_value (NOTMUCH_VALUE_THREAD);
+      value = value_string.c_str();
+      if (strlen (value)) {
+  	id = value;
+  	while (*id) {
+  	    comma = strchr (id, ',');
+  	    if (comma == NULL)
+  		comma = id + strlen (id);
+  	    g_hash_table_insert (thread_ids,
+  				 strndup (id, comma - id), NULL);
+  	    id = comma;
+  	    if (*id)
+  		id++;
+  	}
+      }
+  }
+  
 + 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