X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=database.cc;h=041cffdc9afe49b01a2c54e86a87b88610d25b0d;hp=528ae1154b48d9b4428c214355700e96f5123564;hb=466a7bbf620e4bf1b57097a6d3c474159c475b6d;hpb=55c8ee9a862f8f25be84adb591564b3777d88135

diff --git a/database.cc b/database.cc
index 528ae115..041cffdc 100644
--- a/database.cc
+++ b/database.cc
@@ -18,22 +18,16 @@
  * Author: Carl Worth <cworth@cworth.org>
  */
 
-#include "notmuch-private.h"
+#include "database-private.h"
 
 #include <iostream>
 
 #include <xapian.h>
 
-#include <glib.h> /* g_strdup_printf, g_free, GHashTable */
+#include <glib.h> /* g_strdup_printf, g_free, GPtrArray, GHashTable */
 
 using namespace std;
 
-struct _notmuch_database {
-    char *path;
-    Xapian::WritableDatabase *xapian_db;
-    Xapian::TermGenerator *term_gen;
-};
-
 #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
 
 /* Xapian complains if we provide a term longer than this. */
@@ -450,8 +444,8 @@ notmuch_database_open (const char *path)
 
     err = stat (notmuch_path, &st);
     if (err) {
-	fprintf (stderr, "Error: Cannot stat %s: %s\n",
-		 notmuch_path, strerror (err));
+	fprintf (stderr, "Error opening database at %s: %s\n",
+		 notmuch_path, strerror (errno));
 	goto DONE;
     }
 
@@ -463,6 +457,7 @@ notmuch_database_open (const char *path)
     notmuch->path = xstrdup (path);
 
     try {
+	Xapian::PostingIterator i;
 	notmuch->xapian_db = new Xapian::WritableDatabase (xapian_path,
 							   Xapian::DB_CREATE_OR_OPEN);
     } catch (const Xapian::Error &error) {
@@ -501,7 +496,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 {
     Xapian::WritableDatabase *db = notmuch->xapian_db;
     Xapian::Document doc;
-    notmuch_message_t *message;
+    notmuch_message_file_t *message;
 
     GPtrArray *parents, *thread_ids;
 
@@ -512,16 +507,16 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
     time_t time_value;
     unsigned int i;
 
-    message = notmuch_message_open (filename);
+    message = notmuch_message_file_open (filename);
 
-    notmuch_message_restrict_headers (message,
-				      "date",
-				      "from",
-				      "in-reply-to",
-				      "message-id",
-				      "references",
-				      "subject",
-				      (char *) NULL);
+    notmuch_message_file_restrict_headers (message,
+					   "date",
+					   "from",
+					   "in-reply-to",
+					   "message-id",
+					   "references",
+					   "subject",
+					   (char *) NULL);
 
     try {
 	doc = Xapian::Document ();
@@ -530,16 +525,16 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 
 	parents = g_ptr_array_new ();
 
-	refs = notmuch_message_get_header (message, "references");
+	refs = notmuch_message_file_get_header (message, "references");
 	parse_references (parents, refs);
 
-	in_reply_to = notmuch_message_get_header (message, "in-reply-to");
+	in_reply_to = notmuch_message_file_get_header (message, "in-reply-to");
 	parse_references (parents, in_reply_to);
 
 	for (i = 0; i < parents->len; i++)
 	    add_term (doc, "ref", (char *) g_ptr_array_index (parents, i));
 
-	header = notmuch_message_get_header (message, "message-id");
+	header = notmuch_message_file_get_header (message, "message-id");
 	if (header) {
 	    message_id = parse_message_id (header, NULL);
 	    /* So the header value isn't RFC-compliant, but it's
@@ -577,7 +572,6 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 
 		free (id);
 	    }
-	    g_ptr_array_free (thread_ids, TRUE);
 	    doc.add_value (NOTMUCH_VALUE_THREAD, thread_id->str);
 	    g_string_free (thread_id, TRUE);
 	} else if (message_id) {
@@ -589,23 +583,25 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 	    doc.add_value (NOTMUCH_VALUE_THREAD, thread_id.str);
 	}
 
+	g_ptr_array_free (thread_ids, TRUE);
+
 	free (message_id);
 
-	date = notmuch_message_get_header (message, "date");
+	date = notmuch_message_file_get_header (message, "date");
 	time_value = notmuch_parse_date (date, NULL);
 
 	doc.add_value (NOTMUCH_VALUE_DATE,
 		       Xapian::sortable_serialise (time_value));
 
-	from = notmuch_message_get_header (message, "from");
-	subject = notmuch_message_get_header (message, "subject");
-	to = notmuch_message_get_header (message, "to");
+	from = notmuch_message_file_get_header (message, "from");
+	subject = notmuch_message_file_get_header (message, "subject");
+	to = notmuch_message_file_get_header (message, "to");
 
 	if (from == NULL &&
 	    subject == NULL &&
 	    to == NULL)
 	{
-	    notmuch_message_close (message);
+	    notmuch_message_file_close (message);
 	    return NOTMUCH_STATUS_FILE_NOT_EMAIL;
 	} else {
 	    db->add_document (doc);
@@ -616,7 +612,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 	return NOTMUCH_STATUS_XAPIAN_EXCEPTION;
     }
 
-    notmuch_message_close (message);
+    notmuch_message_file_close (message);
 
     return NOTMUCH_STATUS_SUCCESS;
 }