lib: Rearrange the exclude code in query.cc

[notmuch] / lib / query.cc

diff --git a/lib/query.cc b/lib/query.cc
index b6c0f12d9cd87f73993be6ef6c822319df888995..c25b301db4d7e1fc3b122ed7f6bfa95bc1c73e43 100644 (file)
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -27,6 +27,7 @@ struct _notmuch_query {
     notmuch_database_t *notmuch;
     const char *query_string;
     notmuch_sort_t sort;
+    notmuch_string_list_t *exclude_terms;
 };
 
 typedef struct _notmuch_mset_messages {
@@ -76,6 +77,8 @@ notmuch_query_create (notmuch_database_t *notmuch,
 
     query->sort = NOTMUCH_SORT_NEWEST_FIRST;
 
+    query->exclude_terms = _notmuch_string_list_create (query);
+
     return query;
 }
 
@@ -97,6 +100,13 @@ notmuch_query_get_sort (notmuch_query_t *query)
     return query->sort;
 }
 
+void
+notmuch_query_add_tag_exclude (notmuch_query_t *query, const char *tag)
+{
+    char *term = talloc_asprintf (query, "%s%s", _find_prefix ("tag"), tag);
+    _notmuch_string_list_append (query->exclude_terms, term);
+}
+
 /* We end up having to call the destructors explicitly because we had
  * to use "placement new" in order to initialize C++ objects within a
  * block that we allocated with talloc. So C++ is making talloc
@@ -112,6 +122,30 @@ _notmuch_messages_destructor (notmuch_mset_messages_t *messages)
     return 0;
 }
 
+/* Return a query that matches messages with the excluded tags
+ * registered with query.  Any tags that explicitly appear in xquery
+ * will not be excluded. The caller of this function has to combine
+ * the returned query appropriately.*/
+static Xapian::Query
+_notmuch_exclude_tags (notmuch_query_t *query, Xapian::Query xquery)
+{
+    Xapian::Query exclude_query = Xapian::Query::MatchNothing;
+
+    for (notmuch_string_node_t *term = query->exclude_terms->head; term;
+        term = term->next) {
+       Xapian::TermIterator it = xquery.get_terms_begin ();
+       Xapian::TermIterator end = xquery.get_terms_end ();
+       for (; it != end; it++) {
+           if ((*it).compare (term->string) == 0)
+               break;
+       }
+       if (it == end)
+           exclude_query = Xapian::Query (Xapian::Query::OP_OR,
+                                   exclude_query, Xapian::Query (term->string));
+    }
+    return exclude_query;
+}
+
 notmuch_messages_t *
 notmuch_query_search_messages (notmuch_query_t *query)
 {
@@ -137,7 +171,7 @@ notmuch_query_search_messages (notmuch_query_t *query)
        Xapian::Query mail_query (talloc_asprintf (query, "%s%s",
                                                   _find_prefix ("type"),
                                                   "mail"));
-       Xapian::Query string_query, final_query;
+       Xapian::Query string_query, final_query, exclude_query;
        Xapian::MSet mset;
        unsigned int flags = (Xapian::QueryParser::FLAG_BOOLEAN |
                              Xapian::QueryParser::FLAG_PHRASE |
@@ -157,6 +191,11 @@ notmuch_query_search_messages (notmuch_query_t *query)
                                         mail_query, string_query);
        }
 
+       exclude_query = _notmuch_exclude_tags (query, final_query);
+
+       final_query = Xapian::Query (Xapian::Query::OP_AND_NOT,
+                                        final_query, exclude_query);
+
        enquire.set_weighting_scheme (Xapian::BoolWeight());
 
        switch (query->sort) {
@@ -416,7 +455,7 @@ notmuch_query_count_messages (notmuch_query_t *query)
        Xapian::Query mail_query (talloc_asprintf (query, "%s%s",
                                                   _find_prefix ("type"),
                                                   "mail"));
-       Xapian::Query string_query, final_query;
+       Xapian::Query string_query, final_query, exclude_query;
        Xapian::MSet mset;
        unsigned int flags = (Xapian::QueryParser::FLAG_BOOLEAN |
                              Xapian::QueryParser::FLAG_PHRASE |
@@ -436,6 +475,11 @@ notmuch_query_count_messages (notmuch_query_t *query)
                                         mail_query, string_query);
        }
 
+       exclude_query = _notmuch_exclude_tags (query, final_query);
+
+       final_query = Xapian::Query (Xapian::Query::OP_AND_NOT,
+                                        final_query, exclude_query);
+
        enquire.set_weighting_scheme(Xapian::BoolWeight());
        enquire.set_docid_order(Xapian::Enquire::ASCENDING);