From 14d050067eda5c25fffdfae4c72bd51846cab74f Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Thu, 1 Mar 2012 22:30:37 +0000 Subject: [PATCH] [Patch v7 05/13] lib: Make notmuch_query_search_messages set the exclude flag --- f1/54f62b43f5cfa6ae556ba222fea4eb28e48f03 | 255 ++++++++++++++++++++++ 1 file changed, 255 insertions(+) create mode 100644 f1/54f62b43f5cfa6ae556ba222fea4eb28e48f03 diff --git a/f1/54f62b43f5cfa6ae556ba222fea4eb28e48f03 b/f1/54f62b43f5cfa6ae556ba222fea4eb28e48f03 new file mode 100644 index 000000000..544d9f4c8 --- /dev/null +++ b/f1/54f62b43f5cfa6ae556ba222fea4eb28e48f03 @@ -0,0 +1,255 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id B5038431FDE + for ; Thu, 1 Mar 2012 14:29:45 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id YXxIMO5o8-0m for ; + Thu, 1 Mar 2012 14:29:43 -0800 (PST) +Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com + [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 05E52429E3D + for ; Thu, 1 Mar 2012 14:29:25 -0800 (PST) +Received: by mail-wi0-f181.google.com with SMTP id o1so305757wic.26 + for ; Thu, 01 Mar 2012 14:29:25 -0800 (PST) +Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates + 10.180.84.170 as permitted sender) client-ip=10.180.84.170; +Authentication-Results: mr.google.com; spf=pass (google.com: domain of + markwalters1009@gmail.com designates 10.180.84.170 as permitted + sender) smtp.mail=markwalters1009@gmail.com; + dkim=pass header.i=markwalters1009@gmail.com +Received: from mr.google.com ([10.180.84.170]) + by 10.180.84.170 with SMTP id a10mr6523375wiz.9.1330640965867 (num_hops + = 1); Thu, 01 Mar 2012 14:29:25 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=SoROdO1KnSo5ZQOPHxwkh6inm1EtWKujflP7hNz3yVM=; + b=gNvReNVnUuJQb2NsEblMA4/wRFDzEtZ5DZaNpTmiF4zScm67RHChTEu1/t9qkczSET + sr1QAZKXhN9U/W3HVdeXlqQo+B5FtJ7A61maDF8zyigT1Yc03DkWwbuHBvwJUE/+6wHV + 9GEm1Atsw24evh8Z5Mf+nJz4zf2dux5o/kocoy/3hNeNvdeLNFwhAjdhaujjZKRA14zR + XoZin4RERWzmnYPXsxR/X4tTy1yYNvtej7YU8QjJcvYtJp8uszM23dAZJakcTrI6NBb4 + M3oKp6uXFY0IOyzWUZLRJWpu2WWQ66QXilW6xYz8P+dvIGH+ueiALfVi3N3Ynz81yaDg + GWNg== +Received: by 10.180.84.170 with SMTP id a10mr5262781wiz.9.1330640965803; + Thu, 01 Mar 2012 14:29:25 -0800 (PST) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + 9sm16612907wid.2.2012.03.01.14.29.16 (version=TLSv1/SSLv3 cipher=OTHER); Thu, + 01 Mar 2012 14:29:17 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [Patch v7 05/13] lib: Make notmuch_query_search_messages set the + exclude flag +Date: Thu, 1 Mar 2012 22:30:37 +0000 +Message-Id: <1330641045-27416-6-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.2.3 +In-Reply-To: <1330641045-27416-1-git-send-email-markwalters1009@gmail.com> +References: <1330641045-27416-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 01 Mar 2012 22:29:46 -0000 + +Add a flag NOTMUCH_MESSAGE_FLAG_EXCLUDED which is set by +notmuch_query_search_messages for excluded messages. Also add an +option omit_excluded_messages to the search that we do not want the +excludes at all. + +This exclude flag will be added to notmuch_query_search threads in the +next patch. +--- + lib/notmuch-private.h | 1 + + lib/notmuch.h | 10 +++++++- + lib/query.cc | 59 ++++++++++++++++++++++++++++++++++++++++++++----- + 3 files changed, 63 insertions(+), 7 deletions(-) + +diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h +index 7bf153e..e791bb0 100644 +--- a/lib/notmuch-private.h ++++ b/lib/notmuch-private.h +@@ -401,6 +401,7 @@ typedef struct _notmuch_message_list { + */ + struct visible _notmuch_messages { + notmuch_bool_t is_of_list_type; ++ notmuch_doc_id_set_t *excluded_doc_ids; + notmuch_message_node_t *iterator; + }; + +diff --git a/lib/notmuch.h b/lib/notmuch.h +index 7929fe7..f75afae 100644 +--- a/lib/notmuch.h ++++ b/lib/notmuch.h +@@ -449,6 +449,13 @@ typedef enum { + const char * + notmuch_query_get_query_string (notmuch_query_t *query); + ++/* Specify whether to results should omit the excluded results rather ++ * than just marking them excluded. This is useful for passing a ++ * notmuch_messages_t not containing the excluded messages to other ++ * functions. */ ++void ++notmuch_query_set_omit_excluded_messages (notmuch_query_t *query, notmuch_bool_t omit); ++ + /* Specify the sorting desired for this query. */ + void + notmuch_query_set_sort (notmuch_query_t *query, notmuch_sort_t sort); +@@ -895,7 +902,8 @@ notmuch_message_get_filenames (notmuch_message_t *message); + + /* Message flags */ + typedef enum _notmuch_message_flag { +- NOTMUCH_MESSAGE_FLAG_MATCH ++ NOTMUCH_MESSAGE_FLAG_MATCH, ++ NOTMUCH_MESSAGE_FLAG_EXCLUDED + } notmuch_message_flag_t; + + /* Get a value of a flag for the email corresponding to 'message'. */ +diff --git a/lib/query.cc b/lib/query.cc +index c25b301..ef2a11f 100644 +--- a/lib/query.cc ++++ b/lib/query.cc +@@ -28,6 +28,7 @@ struct _notmuch_query { + const char *query_string; + notmuch_sort_t sort; + notmuch_string_list_t *exclude_terms; ++ notmuch_bool_t omit_excluded_messages; + }; + + typedef struct _notmuch_mset_messages { +@@ -57,6 +58,12 @@ struct visible _notmuch_threads { + notmuch_doc_id_set_t match_set; + }; + ++/* We need this in the message functions so forward declare. */ ++static notmuch_bool_t ++_notmuch_doc_id_set_init (void *ctx, ++ notmuch_doc_id_set_t *doc_ids, ++ GArray *arr); ++ + notmuch_query_t * + notmuch_query_create (notmuch_database_t *notmuch, + const char *query_string) +@@ -79,6 +86,8 @@ notmuch_query_create (notmuch_database_t *notmuch, + + query->exclude_terms = _notmuch_string_list_create (query); + ++ query->omit_excluded_messages = FALSE; ++ + return query; + } + +@@ -89,6 +98,12 @@ notmuch_query_get_query_string (notmuch_query_t *query) + } + + void ++notmuch_query_set_omit_excluded_messages (notmuch_query_t *query, notmuch_bool_t omit) ++{ ++ query->omit_excluded_messages = omit; ++} ++ ++void + notmuch_query_set_sort (notmuch_query_t *query, notmuch_sort_t sort) + { + query->sort = sort; +@@ -124,8 +139,9 @@ _notmuch_messages_destructor (notmuch_mset_messages_t *messages) + + /* 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.*/ ++ * will not be excluded, and will be removed from the list of exclude ++ * tags. 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) + { +@@ -142,6 +158,8 @@ _notmuch_exclude_tags (notmuch_query_t *query, Xapian::Query xquery) + if (it == end) + exclude_query = Xapian::Query (Xapian::Query::OP_OR, + exclude_query, Xapian::Query (term->string)); ++ else ++ term->string = talloc_strdup (query, ""); + } + return exclude_query; + } +@@ -173,6 +191,7 @@ notmuch_query_search_messages (notmuch_query_t *query) + "mail")); + 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 | +@@ -190,11 +209,35 @@ notmuch_query_search_messages (notmuch_query_t *query) + final_query = Xapian::Query (Xapian::Query::OP_AND, + mail_query, string_query); + } ++ messages->base.excluded_doc_ids = NULL; ++ ++ if (query->exclude_terms) { ++ exclude_query = _notmuch_exclude_tags (query, final_query); ++ exclude_query = Xapian::Query (Xapian::Query::OP_AND, ++ exclude_query, final_query); ++ ++ if (query->omit_excluded_messages) ++ final_query = Xapian::Query (Xapian::Query::OP_AND_NOT, ++ final_query, exclude_query); ++ else { ++ enquire.set_weighting_scheme (Xapian::BoolWeight()); ++ enquire.set_query (exclude_query); ++ ++ mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ()); ++ ++ GArray *excluded_doc_ids = g_array_new (FALSE, FALSE, sizeof (unsigned int)); ++ ++ for (iterator = mset.begin (); iterator != mset.end (); iterator++) { ++ unsigned int doc_id = *iterator; ++ g_array_append_val (excluded_doc_ids, doc_id); ++ } ++ messages->base.excluded_doc_ids = talloc (messages, _notmuch_doc_id_set); ++ _notmuch_doc_id_set_init (query, messages->base.excluded_doc_ids, ++ excluded_doc_ids); ++ g_array_unref (excluded_doc_ids); ++ } ++ } + +- 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()); + +@@ -283,6 +326,10 @@ _notmuch_mset_messages_get (notmuch_messages_t *messages) + INTERNAL_ERROR ("a messages iterator contains a non-existent document ID.\n"); + } + ++ if (messages->excluded_doc_ids && ++ _notmuch_doc_id_set_contains (messages->excluded_doc_ids, doc_id)) ++ notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED, TRUE); ++ + return message; + } + +-- +1.7.2.3 + -- 2.26.2