09/f482db52396d21f8ea2f4dd001177a685ab372

   1 Return-Path: <amthrax@drake.mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 0F040431FAE\r
   6         for <notmuch@notmuchmail.org>; Tue, 13 Mar 2012 19:31:37 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id DMwCSMWyTMYX for <notmuch@notmuchmail.org>;\r
  16         Tue, 13 Mar 2012 19:31:36 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
  18         [18.9.25.13])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 0FCB9431FBC\r
  20         for <notmuch@notmuchmail.org>; Tue, 13 Mar 2012 19:31:36 -0700 (PDT)\r
  21 X-AuditID: 1209190d-b7fbf6d0000008ba-7a-4f600306ed3d\r
  22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  23         by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 6B.7F.02234.603006F4; Tue, 13 Mar 2012 22:31:34 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q2E2VYKK018595; \r
  27         Tue, 13 Mar 2012 22:31:34 -0400\r
  28 Received: from drake.mit.edu\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q2E2VWvj023784\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Tue, 13 Mar 2012 22:31:33 -0400 (EDT)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amthrax@drake.mit.edu>)\r
  37         id 1S7dzw-0007DF-Oq; Tue, 13 Mar 2012 22:31:32 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 2/2] lib: Add exclude query debug output\r
  41 Date: Tue, 13 Mar 2012 22:31:31 -0400\r
  42 Message-Id: <1331692291-27671-3-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.7.3\r
  44 In-Reply-To: <1331692291-27671-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1331692291-27671-1-git-send-email-amdragon@mit.edu>\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixCmqrcvGnOBvcO2picX1mzOZHRg9nq26\r
  48         xRzAGMVlk5Kak1mWWqRvl8CV0XFuG3vBdY6Ko2/+sTUwfmHrYuTkkBAwkXg29SYjhC0mceHe\r
  49         eqA4F4eQwD5GibM7ZzJDOBsYJbacmMMO4dxnkmjdfxzKmc8o8Wr3N2aQfjYBDYlt+5eDzRIR\r
  50         kJbYeXc2axcjBwezgJrEny4VkLCwgIXEp2l32UFsFgFViTk7loLZvAIOEs87dkOdpCBxbvU5\r
  51         sDingKPEpf/zwEYKAdU0LH/PNoGRfwEjwypG2ZTcKt3cxMyc4tRk3eLkxLy81CJdI73czBK9\r
  52         1JTSTYzgsJHk3cH47qDSIUYBDkYlHt6s+nh/IdbEsuLK3EOMkhxMSqK8kW+BQnxJ+SmVGYnF\r
  53         GfFFpTmpxYcYJTiYlUR4X0wFyvGmJFZWpRblw6SkOViUxHlVtd75CQmkJ5akZqemFqQWwWRl\r
  54         ODiUJHhVQIYKFqWmp1akZeaUIKSZODhBhvMADS//DjK8uCAxtzgzHSJ/ilFRSpz3zhughABI\r
  55         IqM0D64XFtevGMWBXhHmXQlSxQNMCXDdr4AGMwENLvkWBzK4JBEhJdXAyLLrrp5r7V7B2Oo1\r
  56         sY2aKl86z5XqyijU7JSbb5e0rD8v5W9e+IrYYh0vb67Jv7+XarVaTNvifOHwI2ONFRPKflYF\r
  57         601k63V+a96msCQsSX+X3jFt6Tf/C56aVPfnT3ibU5g9of5Tqe4PldmhGSt5HiSsVOFfn/Tp\r
  58         CU+n5L0rzm/brE/wXZquxFKckWioxVxUnAgAohwNccYCAAA=\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Wed, 14 Mar 2012 02:31:37 -0000\r
  72 \r
  73 ---\r
  74  lib/query.cc |   10 ++++++++--\r
  75  1 files changed, 8 insertions(+), 2 deletions(-)\r
  76 \r
  77 diff --git a/lib/query.cc b/lib/query.cc\r
  78 index 1e5e99a..53d505a 100644\r
  79 --- a/lib/query.cc\r
  80 +++ b/lib/query.cc\r
  81 @@ -261,9 +261,12 @@ notmuch_query_search_messages (notmuch_query_t *query)\r
  82             break;\r
  83         }\r
  84  \r
  85 -       if (_debug_query ())\r
  86 +       if (_debug_query ()) {\r
  87 +           fprintf (stderr, "Exclude query is:\n%s\n",\r
  88 +                    exclude_query.get_description ().c_str ());\r
  89             fprintf (stderr, "Final query is:\n%s\n",\r
  90                      final_query.get_description ().c_str ());\r
  91 +       }\r
  92  \r
  93         enquire.set_query (final_query);\r
  94  \r
  95 @@ -537,9 +540,12 @@ notmuch_query_count_messages (notmuch_query_t *query)\r
  96         enquire.set_weighting_scheme(Xapian::BoolWeight());\r
  97         enquire.set_docid_order(Xapian::Enquire::ASCENDING);\r
  98  \r
  99 -       if (_debug_query ())\r
 100 +       if (_debug_query ()) {\r
 101 +           fprintf (stderr, "Exclude query is:\n%s\n",\r
 102 +                    exclude_query.get_description ().c_str ());\r
 103             fprintf (stderr, "Final query is:\n%s\n",\r
 104                      final_query.get_description ().c_str ());\r
 105 +       }\r
 106  \r
 107         enquire.set_query (final_query);\r
 108  \r
 109 -- \r
 110 1.7.7.3\r
 111 \r