return "No error occurred";
case NOTMUCH_STATUS_OUT_OF_MEMORY:
return "Out of memory";
+ case NOTMUCH_STATUS_READONLY_DATABASE:
+ return "The database is read-only";
case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
return "A Xapian exception occurred";
case NOTMUCH_STATUS_FILE_ERROR:
case NOTMUCH_STATUS_TAG_TOO_LONG:
return "Tag value is too long (exceeds NOTMUCH_TAG_MAX)";
case NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW:
- return "Unblanced number of calls to notmuch_message_freeze/thaw";
+ return "Unbalanced number of calls to notmuch_message_freeze/thaw";
default:
case NOTMUCH_STATUS_LAST_STATUS:
return "Unknown error status value";
const char *s, *end;
char *result;
- if (message_id == NULL)
+ if (message_id == NULL || *message_id == '\0')
return NULL;
s = message_id;
{
char *ref;
- if (refs == NULL)
+ if (refs == NULL || *refs == '\0')
return;
while (*refs) {
goto DONE;
}
- notmuch = notmuch_database_open (path);
+ notmuch = notmuch_database_open (path,
+ NOTMUCH_DATABASE_MODE_WRITABLE);
DONE:
if (notmuch_path)
}
notmuch_database_t *
-notmuch_database_open (const char *path)
+notmuch_database_open (const char *path,
+ notmuch_database_mode_t mode)
{
notmuch_database_t *notmuch = NULL;
char *notmuch_path = NULL, *xapian_path = NULL;
if (notmuch->path[strlen (notmuch->path) - 1] == '/')
notmuch->path[strlen (notmuch->path) - 1] = '\0';
+ notmuch->mode = mode;
try {
- notmuch->xapian_db = new Xapian::WritableDatabase (xapian_path,
- Xapian::DB_CREATE_OR_OPEN);
+ if (mode == NOTMUCH_DATABASE_MODE_WRITABLE) {
+ notmuch->xapian_db = new Xapian::WritableDatabase (xapian_path,
+ Xapian::DB_CREATE_OR_OPEN);
+ } else {
+ notmuch->xapian_db = new Xapian::Database (xapian_path);
+ }
notmuch->query_parser = new Xapian::QueryParser;
notmuch->term_gen = new Xapian::TermGenerator;
notmuch->term_gen->set_stemmer (Xapian::Stem ("english"));
void
notmuch_database_close (notmuch_database_t *notmuch)
{
- notmuch->xapian_db->flush ();
+ if (notmuch->mode == NOTMUCH_DATABASE_MODE_WRITABLE)
+ (static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db))->flush ();
delete notmuch->term_gen;
delete notmuch->query_parser;
const char *key, time_t timestamp)
{
Xapian::Document doc;
+ Xapian::WritableDatabase *db;
unsigned int doc_id;
notmuch_private_status_t status;
notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
char *db_key = NULL;
+ if (notmuch->mode == NOTMUCH_DATABASE_MODE_READONLY) {
+ fprintf (stderr, "Attempted to update a read-only database.\n");
+ return NOTMUCH_STATUS_READONLY_DATABASE;
+ }
+
+ db = static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db);
db_key = timestamp_db_key (key);
try {
doc.add_term (term);
talloc_free (term);
- notmuch->xapian_db->add_document (doc);
+ db->add_document (doc);
} else {
- notmuch->xapian_db->replace_document (doc_id, doc);
+ db->replace_document (doc_id, doc);
}
} catch (Xapian::Error &error) {
subject = notmuch_message_file_get_header (message_file, "subject");
to = notmuch_message_file_get_header (message_file, "to");
- if (from == NULL &&
- subject == NULL &&
- to == NULL)
+ if ((from == NULL || *from == '\0') &&
+ (subject == NULL || *subject == '\0') &&
+ (to == NULL || *to == '\0'))
{
ret = NOTMUCH_STATUS_FILE_NOT_EMAIL;
goto DONE;
* is to find a message ID (or else create one ourselves). */
header = notmuch_message_file_get_header (message_file, "message-id");
- if (header) {
+ if (header && *header != '\0') {
message_id = _parse_message_id (message_file, header, NULL);
/* So the header value isn't RFC-compliant, but it's
* better than no message-id at all. */
talloc_free (message_id);
- if (message == NULL)
+ if (message == NULL) {
+ ret = COERCE_STATUS (private_status,
+ "Unexpected status value from _notmuch_message_create_for_message_id");
goto DONE;
+ }
/* Is this a newly created message object? */
if (private_status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) {