* 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. */
{ "ref", "R" }
};
-/* Similarly, these value numbers are also chosen to be sup
- * compatible. */
-
-typedef enum {
- NOTMUCH_VALUE_MESSAGE_ID = 0,
- NOTMUCH_VALUE_THREAD = 1,
- NOTMUCH_VALUE_DATE = 2
-} notmuch_value_t;
-
static const char *
find_prefix (const char *name)
{
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;
}
try {
notmuch->xapian_db = new Xapian::WritableDatabase (xapian_path,
Xapian::DB_CREATE_OR_OPEN);
+ notmuch->query_parser = new Xapian::QueryParser;
+ notmuch->query_parser->set_default_op (Xapian::Query::OP_AND);
+ notmuch->query_parser->set_database (*notmuch->xapian_db);
} catch (const Xapian::Error &error) {
fprintf (stderr, "A Xapian exception occurred: %s\n",
error.get_msg().c_str());
void
notmuch_database_close (notmuch_database_t *notmuch)
{
+ delete notmuch->query_parser;
delete notmuch->xapian_db;
free (notmuch->path);
free (notmuch);
{
Xapian::WritableDatabase *db = notmuch->xapian_db;
Xapian::Document doc;
- notmuch_message_t *message;
+ notmuch_message_file_t *message;
GPtrArray *parents, *thread_ids;
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 ();
-
doc.set_data (filename);
+ add_term (doc, "type", "mail");
+
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
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) {
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);
return NOTMUCH_STATUS_XAPIAN_EXCEPTION;
}
- notmuch_message_close (message);
+ notmuch_message_file_close (message);
return NOTMUCH_STATUS_SUCCESS;
}