diff options
| -rw-r--r-- | database.cc | 33 | ||||
| -rw-r--r-- | message.cc | 6 |
2 files changed, 27 insertions, 12 deletions
diff --git a/database.cc b/database.cc index 5049b47e..6d62109e 100644 --- a/database.cc +++ b/database.cc @@ -133,6 +133,29 @@ find_message_by_docid (Xapian::Database *db, Xapian::docid docid) return db->get_document (docid); } +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) @@ -174,16 +197,8 @@ find_thread_ids (notmuch_database_t *notmuch, find_messages_by_term (db, "ref", message_id, &child, &children_end); for ( ; child != children_end; child++) { - const char *thread_id; doc = find_message_by_docid (db, *child); - - thread_id = doc.get_value (NOTMUCH_VALUE_THREAD).c_str (); - if (strlen (thread_id) == 0) { - fprintf (stderr, "Database error: Message with doc_id %u has empty thread-id value (value index %d)\n", - *child, NOTMUCH_VALUE_THREAD); - } else { - g_hash_table_insert (thread_ids, strdup (thread_id), NULL); - } + insert_thread_id (thread_ids, doc); } for (i = 0; i < parents->len; i++) { @@ -190,14 +190,14 @@ notmuch_thread_ids_t * notmuch_message_get_thread_ids (notmuch_message_t *message) { notmuch_thread_ids_t *thread_ids; - const char *id_str; + std::string id_str; thread_ids = talloc (message, notmuch_thread_ids_t); if (unlikely (thread_ids == NULL)) return NULL; - id_str = message->doc.get_value (NOTMUCH_VALUE_THREAD).c_str (); - thread_ids->next = talloc_strdup (message, id_str); + id_str = message->doc.get_value (NOTMUCH_VALUE_THREAD); + thread_ids->next = talloc_strdup (message, id_str.c_str ()); /* Initialize thread_ids->current and terminate first ID. */ notmuch_thread_ids_advance (thread_ids); |