--- /dev/null
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 55458429E54\r
+ for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 17:17:56 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+ RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id YNAm1vyg-6qb for <notmuch@notmuchmail.org>;\r
+ Mon, 23 Jan 2012 17:17:55 -0800 (PST)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+ [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 80CAB429E21\r
+ for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 17:17:55 -0800 (PST)\r
+Received: by werb10 with SMTP id b10so3021166wer.26\r
+ for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 17:17:53 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+ h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+ bh=rhldndG9ruLRJb+AbUY+7HqweyOclJiV//Df8mkLrLM=;\r
+ b=YwvLs/bWPG47TUdHpTCI5Ixs2IGtkG32Se7SL0lhwCTupFdyy9P0kkjG4byjZ++Qnj\r
+ 8sEHEWC2McHHcB8F23i4vknzAKQK55a4D40j9rVN6m59zShq150plVOfTgRcy7DcYYHi\r
+ zFkVJXNhVUwsa3DDvDz4+1yiK3Yt10Ki4jWag=\r
+Received: by 10.216.136.152 with SMTP id w24mr4288499wei.50.1327367872914;\r
+ Mon, 23 Jan 2012 17:17:52 -0800 (PST)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223]) by mx.google.com with ESMTPS id\r
+ n3sm46907333wiz.9.2012.01.23.17.17.51 (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Mon, 23 Jan 2012 17:17:52 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+ Austin Clements <amdragon@MIT.EDU>\r
+Subject: [RFC PATCH 1/4] Add NOTMUCH_MESSAGE_FLAG_EXCLUDED flag\r
+Date: Tue, 24 Jan 2012 01:18:40 +0000\r
+Message-Id: <1327367923-18228-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <20120124011609.GX16740@mit.edu>\r
+References: <20120124011609.GX16740@mit.edu>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 24 Jan 2012 01:17:56 -0000\r
+\r
+Slightly refactor the exclude code to give the callers access to the\r
+exclude query itself. There should be no functional change.\r
+\r
+---\r
+ lib/query.cc | 29 +++++++++++++++++++----------\r
+ 1 files changed, 19 insertions(+), 10 deletions(-)\r
+\r
+diff --git a/lib/query.cc b/lib/query.cc\r
+index 0b36602..c25b301 100644\r
+--- a/lib/query.cc\r
++++ b/lib/query.cc\r
+@@ -122,12 +122,15 @@ _notmuch_messages_destructor (notmuch_mset_messages_t *messages)\r
+ return 0;\r
+ }\r
+ \r
+-/* Return a query that does not match messages with the excluded tags\r
+- * registered with the query. Any tags that explicitly appear in\r
+- * xquery will not be excluded. */\r
++/* Return a query that matches messages with the excluded tags\r
++ * registered with query. Any tags that explicitly appear in xquery\r
++ * will not be excluded. The caller of this function has to combine\r
++ * the returned query appropriately.*/\r
+ static Xapian::Query\r
+ _notmuch_exclude_tags (notmuch_query_t *query, Xapian::Query xquery)\r
+ {\r
++ Xapian::Query exclude_query = Xapian::Query::MatchNothing;\r
++\r
+ for (notmuch_string_node_t *term = query->exclude_terms->head; term;\r
+ term = term->next) {\r
+ Xapian::TermIterator it = xquery.get_terms_begin ();\r
+@@ -137,10 +140,10 @@ _notmuch_exclude_tags (notmuch_query_t *query, Xapian::Query xquery)\r
+ break;\r
+ }\r
+ if (it == end)\r
+- xquery = Xapian::Query (Xapian::Query::OP_AND_NOT,\r
+- xquery, Xapian::Query (term->string));\r
++ exclude_query = Xapian::Query (Xapian::Query::OP_OR,\r
++ exclude_query, Xapian::Query (term->string));\r
+ }\r
+- return xquery;\r
++ return exclude_query;\r
+ }\r
+ \r
+ notmuch_messages_t *\r
+@@ -168,7 +171,7 @@ notmuch_query_search_messages (notmuch_query_t *query)\r
+ Xapian::Query mail_query (talloc_asprintf (query, "%s%s",\r
+ _find_prefix ("type"),\r
+ "mail"));\r
+- Xapian::Query string_query, final_query;\r
++ Xapian::Query string_query, final_query, exclude_query;\r
+ Xapian::MSet mset;\r
+ unsigned int flags = (Xapian::QueryParser::FLAG_BOOLEAN |\r
+ Xapian::QueryParser::FLAG_PHRASE |\r
+@@ -188,7 +191,10 @@ notmuch_query_search_messages (notmuch_query_t *query)\r
+ mail_query, string_query);\r
+ }\r
+ \r
+- final_query = _notmuch_exclude_tags (query, final_query);\r
++ exclude_query = _notmuch_exclude_tags (query, final_query);\r
++\r
++ final_query = Xapian::Query (Xapian::Query::OP_AND_NOT,\r
++ final_query, exclude_query);\r
+ \r
+ enquire.set_weighting_scheme (Xapian::BoolWeight());\r
+ \r
+@@ -449,7 +455,7 @@ notmuch_query_count_messages (notmuch_query_t *query)\r
+ Xapian::Query mail_query (talloc_asprintf (query, "%s%s",\r
+ _find_prefix ("type"),\r
+ "mail"));\r
+- Xapian::Query string_query, final_query;\r
++ Xapian::Query string_query, final_query, exclude_query;\r
+ Xapian::MSet mset;\r
+ unsigned int flags = (Xapian::QueryParser::FLAG_BOOLEAN |\r
+ Xapian::QueryParser::FLAG_PHRASE |\r
+@@ -469,7 +475,10 @@ notmuch_query_count_messages (notmuch_query_t *query)\r
+ mail_query, string_query);\r
+ }\r
+ \r
+- final_query = _notmuch_exclude_tags (query, final_query);\r
++ exclude_query = _notmuch_exclude_tags (query, final_query);\r
++\r
++ final_query = Xapian::Query (Xapian::Query::OP_AND_NOT,\r
++ final_query, exclude_query);\r
+ \r
+ enquire.set_weighting_scheme(Xapian::BoolWeight());\r
+ enquire.set_docid_order(Xapian::Enquire::ASCENDING);\r
+-- \r
+1.7.2.3\r
+\r
projects / notmuch-archives.git / commitdiff