When a search query triggers a Xapian exception, log what the query was.

[notmuch] / lib / query.cc

diff --git a/lib/query.cc b/lib/query.cc
index d499a219aefddec48bff8ea58f9c57bebd3b0740..ea521dd822faac03719be787d4bd82f708ca2f77 100644 (file)
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -61,7 +61,7 @@ notmuch_query_create (notmuch_database_t *notmuch,
 
     query->query_string = talloc_strdup (query, query_string);
 
-    query->sort = NOTMUCH_SORT_DATE;
+    query->sort = NOTMUCH_SORT_NEWEST_FIRST;
 
     return query;
 }
@@ -79,11 +79,11 @@ notmuch_query_search_messages (notmuch_query_t *query,
 {
     notmuch_database_t *notmuch = query->notmuch;
     const char *query_string = query->query_string;
-    notmuch_messages_t *messages;
+    notmuch_message_list_t *message_list;
     Xapian::MSetIterator i;
 
-    messages = _notmuch_messages_create (query);
-    if (unlikely (messages == NULL))
+    message_list = _notmuch_message_list_create (query);
+    if (unlikely (message_list == NULL))
        return NULL;
 
     try {
@@ -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;
@@ -109,10 +110,10 @@ notmuch_query_search_messages (notmuch_query_t *query,
        }
 
        switch (query->sort) {
-       case NOTMUCH_SORT_DATE:
+       case NOTMUCH_SORT_OLDEST_FIRST:
            enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, FALSE);
            break;
-       case NOTMUCH_SORT_DATE_REVERSE:
+       case NOTMUCH_SORT_NEWEST_FIRST:
            enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, TRUE);
            break;
        case NOTMUCH_SORT_MESSAGE_ID:
@@ -134,7 +135,7 @@ notmuch_query_search_messages (notmuch_query_t *query,
            notmuch_message_t *message;
            notmuch_private_status_t status;
 
-           message = _notmuch_message_create (messages, notmuch,
+           message = _notmuch_message_create (message_list, notmuch,
                                               *i, &status);
            if (message == NULL)
            {
@@ -144,15 +145,16 @@ notmuch_query_search_messages (notmuch_query_t *query,
                break;
            }
 
-           _notmuch_messages_add_message (messages, message);
+           _notmuch_message_list_add_message (message_list, message);
        }
 
     } catch (const Xapian::Error &error) {
        fprintf (stderr, "A Xapian exception occurred: %s\n",
                 error.get_msg().c_str());
+       fprintf (stderr, "Query string was: %s\n", query->query_string);
     }
 
-    return messages;
+    return _notmuch_messages_create (message_list);
 }
 
 /* Glib objects force use to use a talloc destructor as well, (but not