lib: provide _notmuch_database_log_append

[notmuch] / lib / query.cc

diff --git a/lib/query.cc b/lib/query.cc
index e627bfc2a3b5b576815172df2e4a2ae67e5c069b..53efd4e18fc1698d88c0b8ac476fd33094f2e2fc 100644 (file)
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
@@ -186,6 +186,14 @@ notmuch_query_search_messages (notmuch_query_t *query)
 notmuch_status_t
 notmuch_query_search_messages_st (notmuch_query_t *query,
                                  notmuch_messages_t **out)
+{
+    return _notmuch_query_search_documents (query, "mail", out);
+}
+
+notmuch_status_t
+_notmuch_query_search_documents (notmuch_query_t *query,
+                                const char *type,
+                                notmuch_messages_t **out)
 {
     notmuch_database_t *notmuch = query->notmuch;
     const char *query_string = query->query_string;
@@ -208,16 +216,10 @@ notmuch_query_search_messages_st (notmuch_query_t *query,
        Xapian::Enquire enquire (*notmuch->xapian_db);
        Xapian::Query mail_query (talloc_asprintf (query, "%s%s",
                                                   _find_prefix ("type"),
-                                                  "mail"));
+                                                  type));
        Xapian::Query string_query, final_query, exclude_query;
        Xapian::MSet mset;
        Xapian::MSetIterator iterator;
-       unsigned int flags = (Xapian::QueryParser::FLAG_BOOLEAN |
-                             Xapian::QueryParser::FLAG_PHRASE |
-                             Xapian::QueryParser::FLAG_LOVEHATE |
-                             Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE |
-                             Xapian::QueryParser::FLAG_WILDCARD |
-                             Xapian::QueryParser::FLAG_PURE_NOT);
 
        if (strcmp (query_string, "") == 0 ||
            strcmp (query_string, "*") == 0)
@@ -225,7 +227,7 @@ notmuch_query_search_messages_st (notmuch_query_t *query,
            final_query = mail_query;
        } else {
            string_query = notmuch->query_parser->
-               parse_query (query_string, flags);
+               parse_query (query_string, NOTMUCH_QUERY_PARSER_FLAGS);
            final_query = Xapian::Query (Xapian::Query::OP_AND,
                                         mail_query, string_query);
        }
@@ -274,7 +276,7 @@ notmuch_query_search_messages_st (notmuch_query_t *query,
        case NOTMUCH_SORT_MESSAGE_ID:
            enquire.set_sort_by_value (NOTMUCH_VALUE_MESSAGE_ID, FALSE);
            break;
-        case NOTMUCH_SORT_UNSORTED:
+       case NOTMUCH_SORT_UNSORTED:
            break;
        }
 
@@ -297,9 +299,10 @@ notmuch_query_search_messages_st (notmuch_query_t *query,
 
     } catch (const Xapian::Error &error) {
        _notmuch_database_log (notmuch,
-                              "A Xapian exception occurred performing query: %s\n"
+                              "A Xapian exception occurred performing query: %s\n",
+                              error.get_msg().c_str());
+       _notmuch_database_log_append (notmuch,
                               "Query string was: %s\n",
-                              error.get_msg().c_str(),
                               query->query_string);
 
        notmuch->exception_reported = TRUE;
@@ -410,7 +413,7 @@ _notmuch_doc_id_set_contains (notmuch_doc_id_set_t *doc_ids,
 
 void
 _notmuch_doc_id_set_remove (notmuch_doc_id_set_t *doc_ids,
-                            unsigned int doc_id)
+                           unsigned int doc_id)
 {
     if (doc_id < doc_ids->bound)
        doc_ids->bitmap[DOCIDSET_WORD(doc_id)] &= ~(1 << DOCIDSET_BIT(doc_id));
@@ -553,6 +556,12 @@ notmuch_query_count_messages (notmuch_query_t *query)
 
 notmuch_status_t
 notmuch_query_count_messages_st (notmuch_query_t *query, unsigned *count_out)
+{
+    return _notmuch_query_count_documents (query, "mail", count_out);
+}
+
+notmuch_status_t
+_notmuch_query_count_documents (notmuch_query_t *query, const char *type, unsigned *count_out)
 {
     notmuch_database_t *notmuch = query->notmuch;
     const char *query_string = query->query_string;
@@ -562,15 +571,9 @@ notmuch_query_count_messages_st (notmuch_query_t *query, unsigned *count_out)
        Xapian::Enquire enquire (*notmuch->xapian_db);
        Xapian::Query mail_query (talloc_asprintf (query, "%s%s",
                                                   _find_prefix ("type"),
-                                                  "mail"));
+                                                  type));
        Xapian::Query string_query, final_query, exclude_query;
        Xapian::MSet mset;
-       unsigned int flags = (Xapian::QueryParser::FLAG_BOOLEAN |
-                             Xapian::QueryParser::FLAG_PHRASE |
-                             Xapian::QueryParser::FLAG_LOVEHATE |
-                             Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE |
-                             Xapian::QueryParser::FLAG_WILDCARD |
-                             Xapian::QueryParser::FLAG_PURE_NOT);
 
        if (strcmp (query_string, "") == 0 ||
            strcmp (query_string, "*") == 0)
@@ -578,7 +581,7 @@ notmuch_query_count_messages_st (notmuch_query_t *query, unsigned *count_out)
            final_query = mail_query;
        } else {
            string_query = notmuch->query_parser->
-               parse_query (query_string, flags);
+               parse_query (query_string, NOTMUCH_QUERY_PARSER_FLAGS);
            final_query = Xapian::Query (Xapian::Query::OP_AND,
                                         mail_query, string_query);
        }
@@ -611,10 +614,11 @@ notmuch_query_count_messages_st (notmuch_query_t *query, unsigned *count_out)
 
     } catch (const Xapian::Error &error) {
        _notmuch_database_log (notmuch,
-                              "A Xapian exception occurred performing query: %s\n"
-                              "Query string was: %s\n",
-                              error.get_msg().c_str(),
-                              query->query_string);
+                              "A Xapian exception occurred performing query: %s\n",
+                              error.get_msg().c_str());
+       _notmuch_database_log_append (notmuch,
+                                     "Query string was: %s\n",
+                                     query->query_string);
        return NOTMUCH_STATUS_XAPIAN_EXCEPTION;
     }