database: Similarly rename find_message_by_docid to find_document_for_doc_id

Again preferring notmuch_database_t* over Xapian::Database*.

Also, we're standardizing on "doc_id" rather than "docid" locally, (as
an analoge to "message_id"), in spite of the "Xapian::docid" name,
(which, fortunately, we can ignore and just us "unsigned int" instead).

diff --git a/database.cc b/database.cc
index 15d159ffd13494d6f672491a04b3e3868630238c..16c514591fbe0c36fed80391604fc58096ac697e 100644 (file)
--- a/database.cc
+++ b/database.cc
@@ -92,10 +92,10 @@ find_doc_ids (notmuch_database_t *notmuch,
     free (term);
 }
 
     free (term);
 }
 

-Xapian::Document
-find_message_by_docid (Xapian::Database *db, Xapian::docid docid)
+static Xapian::Document
+find_document_for_doc_id (notmuch_database_t *notmuch, unsigned doc_id)

 {
 {

-    return db->get_document (docid);
+    return notmuch->xapian_db->get_document (doc_id);

 }
 
 static void
 }
 
 static void


@@ -147,7 +147,6 @@ find_thread_ids (notmuch_database_t *notmuch,
                 GPtrArray *parents,
                 const char *message_id)
 {
                 GPtrArray *parents,
                 const char *message_id)
 {

-    Xapian::WritableDatabase *db = notmuch->xapian_db;

     Xapian::PostingIterator child, children_end;
     Xapian::Document doc;
     GHashTable *thread_ids;
     Xapian::PostingIterator child, children_end;
     Xapian::Document doc;
     GHashTable *thread_ids;


@@ -161,7 +160,7 @@ find_thread_ids (notmuch_database_t *notmuch,
 
     find_doc_ids (notmuch, "ref", message_id, &child, &children_end);
     for ( ; child != children_end; child++) {
 
     find_doc_ids (notmuch, "ref", message_id, &child, &children_end);
     for ( ; child != children_end; child++) {

-       doc = find_message_by_docid (db, *child);
+       doc = find_document_for_doc_id (notmuch, *child);

        insert_thread_id (thread_ids, doc);
     }
 
        insert_thread_id (thread_ids, doc);
     }