Catch and optionally print about exception at database->flush.

[notmuch] / lib / query.cc

diff --git a/lib/query.cc b/lib/query.cc
index a869f3e60d1e0aeace3526c90d8a1e6bde4ae9ff..86167352381e5ed22dd3177e1ce32d98c2b2559d 100644 (file)
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -97,7 +97,8 @@ notmuch_query_search_messages (notmuch_query_t *query,
                              Xapian::QueryParser::FLAG_PHRASE |
                              Xapian::QueryParser::FLAG_LOVEHATE |
                              Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE |
-                             Xapian::QueryParser::FLAG_WILDCARD);
+                             Xapian::QueryParser::FLAG_WILDCARD |
+                             Xapian::QueryParser::FLAG_PURE_NOT);
 
        if (strcmp (query_string, "") == 0) {
            final_query = mail_query;
@@ -148,8 +149,10 @@ notmuch_query_search_messages (notmuch_query_t *query,
        }
 
     } catch (const Xapian::Error &error) {
-       fprintf (stderr, "A Xapian exception occurred: %s\n",
+       fprintf (stderr, "A Xapian exception occurred performing query: %s\n",
                 error.get_msg().c_str());
+       fprintf (stderr, "Query string was: %s\n", query->query_string);
+       notmuch->exception_reported = TRUE;
     }
 
     return _notmuch_messages_create (message_list);