--- /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 831DD431FBF\r
+ for <notmuch@notmuchmail.org>; Sat, 25 Feb 2012 19:14:36 -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 hyzUyJGqp11R for <notmuch@notmuchmail.org>;\r
+ Sat, 25 Feb 2012 19:14:35 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ AEF3A431FAE for <notmuch@notmuchmail.org>; Sat, 25 Feb 2012 19:14:35 -0800\r
+ (PST)\r
+Received: by wgbdt12 with SMTP id dt12so2784835wgb.2\r
+ for <notmuch@notmuchmail.org>; Sat, 25 Feb 2012 19:14:34 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates\r
+ 10.180.92.71 as permitted sender) client-ip=10.180.92.71; \r
+Authentication-Results: mr.google.com; spf=pass (google.com: domain of\r
+ markwalters1009@gmail.com designates 10.180.92.71 as permitted\r
+ sender) smtp.mail=markwalters1009@gmail.com;\r
+ dkim=pass header.i=markwalters1009@gmail.com\r
+Received: from mr.google.com ([10.180.92.71])\r
+ by 10.180.92.71 with SMTP id ck7mr21015935wib.3.1330226074546 (num_hops\r
+ = 1); Sat, 25 Feb 2012 19:14:34 -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=IqeCmc2ELfjZkxjYdYxRGHL3vbcGmotc+462IZgK1tU=;\r
+ b=D75LpKiQC8n/O+GzFLoE1jhz2zc6a8ddD6HpSNofU/x4IhqAOC53dkNzsFWZUMq3pN\r
+ OoECp9BWTdZU+JHVUziTY0eOYVINIHMq8SLILPhbajVoDz7F0iVaYWQGijFrhst90tpn\r
+ moxMApACeNm0FeJx238zdSZpC0C18CpINWtvw=\r
+Received: by 10.180.92.71 with SMTP id ck7mr11461242wib.3.1330157134460;\r
+ Sat, 25 Feb 2012 00:05:34 -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
+ df3sm8234444wib.1.2012.02.25.00.05.33 (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Sat, 25 Feb 2012 00:05:33 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+ Austin Clements <amdragon@MIT.EDU>\r
+Subject: [Patch v6 04/13] lib: Rearrange the exclude code in query.cc\r
+Date: Sat, 25 Feb 2012 08:06:35 +0000\r
+Message-Id: <1330157204-26094-5-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1330157204-26094-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1330157204-26094-1-git-send-email-markwalters1009@gmail.com>\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: Sun, 26 Feb 2012 03:14:36 -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
+ 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