[PATCH 2/2] lib: Add exclude query debug output

diff --git a/09/f482db52396d21f8ea2f4dd001177a685ab372 b/09/f482db52396d21f8ea2f4dd001177a685ab372
new file mode 100644 (file)
index 0000000..d3613d7
--- /dev/null
+++ b/09/f482db52396d21f8ea2f4dd001177a685ab372
@@ -0,0 +1,111 @@
+Return-Path: <amthrax@drake.mit.edu>\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 0F040431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 13 Mar 2012 19:31:37 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 DMwCSMWyTMYX for <notmuch@notmuchmail.org>;\r
+       Tue, 13 Mar 2012 19:31:36 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
+       [18.9.25.13])\r
+       by olra.theworths.org (Postfix) with ESMTP id 0FCB9431FBC\r
+       for <notmuch@notmuchmail.org>; Tue, 13 Mar 2012 19:31:36 -0700 (PDT)\r
+X-AuditID: 1209190d-b7fbf6d0000008ba-7a-4f600306ed3d\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 6B.7F.02234.603006F4; Tue, 13 Mar 2012 22:31:34 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q2E2VYKK018595; \r
+       Tue, 13 Mar 2012 22:31:34 -0400\r
+Received: from drake.mit.edu\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q2E2VWvj023784\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 13 Mar 2012 22:31:33 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1S7dzw-0007DF-Oq; Tue, 13 Mar 2012 22:31:32 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] lib: Add exclude query debug output\r
+Date: Tue, 13 Mar 2012 22:31:31 -0400\r
+Message-Id: <1331692291-27671-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1331692291-27671-1-git-send-email-amdragon@mit.edu>\r
+References: <1331692291-27671-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixCmqrcvGnOBvcO2picX1mzOZHRg9nq26\r
+       xRzAGMVlk5Kak1mWWqRvl8CV0XFuG3vBdY6Ko2/+sTUwfmHrYuTkkBAwkXg29SYjhC0mceHe\r
+       eqA4F4eQwD5GibM7ZzJDOBsYJbacmMMO4dxnkmjdfxzKmc8o8Wr3N2aQfjYBDYlt+5eDzRIR\r
+       kJbYeXc2axcjBwezgJrEny4VkLCwgIXEp2l32UFsFgFViTk7loLZvAIOEs87dkOdpCBxbvU5\r
+       sDingKPEpf/zwEYKAdU0LH/PNoGRfwEjwypG2ZTcKt3cxMyc4tRk3eLkxLy81CJdI73czBK9\r
+       1JTSTYzgsJHk3cH47qDSIUYBDkYlHt6s+nh/IdbEsuLK3EOMkhxMSqK8kW+BQnxJ+SmVGYnF\r
+       GfFFpTmpxYcYJTiYlUR4X0wFyvGmJFZWpRblw6SkOViUxHlVtd75CQmkJ5akZqemFqQWwWRl\r
+       ODiUJHhVQIYKFqWmp1akZeaUIKSZODhBhvMADS//DjK8uCAxtzgzHSJ/ilFRSpz3zhughABI\r
+       IqM0D64XFtevGMWBXhHmXQlSxQNMCXDdr4AGMwENLvkWBzK4JBEhJdXAyLLrrp5r7V7B2Oo1\r
+       sY2aKl86z5XqyijU7JSbb5e0rD8v5W9e+IrYYh0vb67Jv7+XarVaTNvifOHwI2ONFRPKflYF\r
+       601k63V+a96msCQsSX+X3jFt6Tf/C56aVPfnT3ibU5g9of5Tqe4PldmhGSt5HiSsVOFfn/Tp\r
+       CU+n5L0rzm/brE/wXZquxFKckWioxVxUnAgAohwNccYCAAA=\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: Wed, 14 Mar 2012 02:31:37 -0000\r
+\r
+---\r
+ lib/query.cc |   10 ++++++++--\r
+ 1 files changed, 8 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/lib/query.cc b/lib/query.cc\r
+index 1e5e99a..53d505a 100644\r
+--- a/lib/query.cc\r
++++ b/lib/query.cc\r
+@@ -261,9 +261,12 @@ notmuch_query_search_messages (notmuch_query_t *query)\r
+           break;\r
+       }\r
+ \r
+-      if (_debug_query ())\r
++      if (_debug_query ()) {\r
++          fprintf (stderr, "Exclude query is:\n%s\n",\r
++                   exclude_query.get_description ().c_str ());\r
+           fprintf (stderr, "Final query is:\n%s\n",\r
+                    final_query.get_description ().c_str ());\r
++      }\r
+ \r
+       enquire.set_query (final_query);\r
+ \r
+@@ -537,9 +540,12 @@ notmuch_query_count_messages (notmuch_query_t *query)\r
+       enquire.set_weighting_scheme(Xapian::BoolWeight());\r
+       enquire.set_docid_order(Xapian::Enquire::ASCENDING);\r
+ \r
+-      if (_debug_query ())\r
++      if (_debug_query ()) {\r
++          fprintf (stderr, "Exclude query is:\n%s\n",\r
++                   exclude_query.get_description ().c_str ());\r
+           fprintf (stderr, "Final query is:\n%s\n",\r
+                    final_query.get_description ().c_str ());\r
++      }\r
+ \r
+       enquire.set_query (final_query);\r
+ \r
+-- \r
+1.7.7.3\r
+\r