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