8b/1fa8db5b3ef7c2250e8b650a515bfff554963f

   1 Return-Path: <markwalters1009@gmail.com>\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 97B0D431FDA\r
   6         for <notmuch@notmuchmail.org>; Mon, 12 Mar 2012 04:32:07 -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.201\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
  14         RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  15 Received: from olra.theworths.org ([127.0.0.1])\r
  16         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  17         with ESMTP id nDindbRcwrwa for <notmuch@notmuchmail.org>;\r
  18         Mon, 12 Mar 2012 04:32:06 -0700 (PDT)\r
  19 Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com\r
  20         [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  21         (No client certificate requested)\r
  22         by olra.theworths.org (Postfix) with ESMTPS id A9F04431FD4\r
  23         for <notmuch@notmuchmail.org>; Mon, 12 Mar 2012 04:32:02 -0700 (PDT)\r
  24 Received: by mail-wi0-f173.google.com with SMTP id hq7so2904632wib.2\r
  25         for <notmuch@notmuchmail.org>; Mon, 12 Mar 2012 04:32:02 -0700 (PDT)\r
  26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
  27         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
  28         bh=Plo72Kk2I9vFlWvOC36Ei+d49YpOBszVzPQACGMsqsw=;\r
  29         b=L5KgxJawoHm75fT/yJd6KiUt0s4+5p3qFYWb8bFhlxPGo1m13HK3GlZBU6o00O+SyJ\r
  30         0bCKaR1MSrzjjnXEyT3hd72qR5IFf57RwPfvjaz+yIcgbc6meZkKPubDFuq8sV4z/GSN\r
  31         XJCKoFwuq6XMjjL0KRzMuL0wbXbHIUmzH7T7y3aEQfVMjqp8iL1ExGkd7z0ZuJxLIkTy\r
  32         T61pQWEGi+J4pw22X9OIe/97NszVV9vIcjFbxTfLam9CrVf9n58a78Ypkccwv5ypfiO1\r
  33         xw8tpGdOEKIL7QSuldB2MCdF6vfhPoWkMwzuGeKSrFfZRyeAEKS2kdYWvYPR6HVA7Mw3\r
  34         8TgQ==\r
  35 Received: by 10.180.105.69 with SMTP id gk5mr6958371wib.3.1331551922400;\r
  36         Mon, 12 Mar 2012 04:32:02 -0700 (PDT)\r
  37 Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
  38  [94.192.233.223])      by mx.google.com with ESMTPS id\r
  39  w14sm33173137wiv.11.2012.03.12.04.32.01        (version=TLSv1/SSLv3 cipher=OTHER);\r
  40         Mon, 12 Mar 2012 04:32:01 -0700 (PDT)\r
  41 From: Mark Walters <markwalters1009@gmail.com>\r
  42 To: notmuch@notmuchmail.org\r
  43 Subject: [PATCH 2/2] lib: fix an exclude bug\r
  44 Date: Mon, 12 Mar 2012 11:31:54 +0000\r
  45 Message-Id: <1331551914-28323-3-git-send-email-markwalters1009@gmail.com>\r
  46 X-Mailer: git-send-email 1.7.9.1\r
  47 In-Reply-To: <1331551914-28323-1-git-send-email-markwalters1009@gmail.com>\r
  48 References: <1331551914-28323-1-git-send-email-markwalters1009@gmail.com>\r
  49 X-BeenThere: notmuch@notmuchmail.org\r
  50 X-Mailman-Version: 2.1.13\r
  51 Precedence: list\r
  52 List-Id: "Use and development of the notmuch mail system."\r
  53         <notmuch.notmuchmail.org>\r
  54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  55         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  57 List-Post: <mailto:notmuch@notmuchmail.org>\r
  58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  60         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  61 X-List-Received-Date: Mon, 12 Mar 2012 11:32:08 -0000\r
  62 \r
  63 One test using the new exclude code was failing in some\r
  64 configurations.  This patch makes it work for me. It may be a "fix"\r
  65 but I do not see why it fixes it.\r
  66 ---\r
  67  lib/query.cc |    5 +++--\r
  68  1 files changed, 3 insertions(+), 2 deletions(-)\r
  69 \r
  70 diff --git a/lib/query.cc b/lib/query.cc\r
  71 index ab18fbc..2b73d72 100644\r
  72 --- a/lib/query.cc\r
  73 +++ b/lib/query.cc\r
  74 @@ -213,13 +213,14 @@ notmuch_query_search_messages (notmuch_query_t *query)\r
  75  \r
  76         if (query->exclude_terms) {\r
  77             exclude_query = _notmuch_exclude_tags (query, final_query);\r
  78 -           exclude_query = Xapian::Query (Xapian::Query::OP_AND,\r
  79 -                                          exclude_query, final_query);\r
  80  \r
  81             if (query->omit_excluded_messages)\r
  82                 final_query = Xapian::Query (Xapian::Query::OP_AND_NOT,\r
  83                                              final_query, exclude_query);\r
  84             else {\r
  85 +               exclude_query = Xapian::Query (Xapian::Query::OP_AND,\r
  86 +                                          exclude_query, final_query);\r
  87 +\r
  88                 enquire.set_weighting_scheme (Xapian::BoolWeight());\r
  89                 enquire.set_query (exclude_query);\r
  90  \r
  91 -- \r
  92 1.7.9.1\r
  93 \r