Add a missing print after catching an exception.

[notmuch] / lib / message.cc

diff --git a/lib/message.cc b/lib/message.cc
index 41dddd077ea9939d703e95f0606dc1bfc023f053..4a5fae1e5901f584bdddcdd52bb9563aea585d5d 100644 (file)
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -168,9 +168,15 @@ _notmuch_message_create_for_message_id (notmuch_database_t *notmuch,
 {
     notmuch_message_t *message;
     Xapian::Document doc;
 {
     notmuch_message_t *message;
     Xapian::Document doc;

+    Xapian::WritableDatabase *db;

     unsigned int doc_id;
     char *term;
 
     unsigned int doc_id;
     char *term;
 

+    if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) {
+       *status_ret = NOTMUCH_PRIVATE_STATUS_READONLY_DATABASE;
+       return NULL;
+    }
+

     *status_ret = NOTMUCH_PRIVATE_STATUS_SUCCESS;
 
     message = notmuch_database_find_message (notmuch, message_id);
     *status_ret = NOTMUCH_PRIVATE_STATUS_SUCCESS;
 
     message = notmuch_database_find_message (notmuch, message_id);


@@ -184,14 +190,17 @@ _notmuch_message_create_for_message_id (notmuch_database_t *notmuch,
        return NULL;
     }
 
        return NULL;
     }
 

+    db = static_cast<Xapian::WritableDatabase *> (notmuch->xapian_db);

     try {
        doc.add_term (term);
        talloc_free (term);
 
        doc.add_value (NOTMUCH_VALUE_MESSAGE_ID, message_id);
 
     try {
        doc.add_term (term);
        talloc_free (term);
 
        doc.add_value (NOTMUCH_VALUE_MESSAGE_ID, message_id);
 

-       doc_id = notmuch->xapian_db->add_document (doc);
+       doc_id = db->add_document (doc);

     } catch (const Xapian::Error &error) {
     } catch (const Xapian::Error &error) {

+       fprintf (stderr, "A Xapian exception occurred creating message: %s\n",
+                error.get_msg().c_str());

        *status_ret = NOTMUCH_PRIVATE_STATUS_XAPIAN_EXCEPTION;
        return NULL;
     }
        *status_ret = NOTMUCH_PRIVATE_STATUS_XAPIAN_EXCEPTION;
        return NULL;
     }


@@ -491,7 +500,7 @@ _notmuch_message_set_date (notmuch_message_t *message,
 
     /* GMime really doesn't want to see a NULL date, so protect its
      * sensibilities. */
 
     /* GMime really doesn't want to see a NULL date, so protect its
      * sensibilities. */

-    if (date == NULL)
+    if (date == NULL || *date == '\0')

        time_value = 0;
     else
        time_value = g_mime_utils_header_decode_date (date, NULL);
        time_value = 0;
     else
        time_value = g_mime_utils_header_decode_date (date, NULL);


@@ -543,8 +552,12 @@ _notmuch_message_ensure_thread_id (notmuch_message_t *message)
 void
 _notmuch_message_sync (notmuch_message_t *message)
 {
 void
 _notmuch_message_sync (notmuch_message_t *message)
 {

-    Xapian::WritableDatabase *db = message->notmuch->xapian_db;
+    Xapian::WritableDatabase *db;
+
+    if (message->notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY)
+       return;

 
 

+    db = static_cast <Xapian::WritableDatabase *> (message->notmuch->xapian_db);

     db->replace_document (message->doc_id, message->doc);
 }
 
     db->replace_document (message->doc_id, message->doc);
 }