From: Mark Walters <markwalters1009@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH 2/2] lib: fix an exclude bug
Date: Mon, 12 Mar 2012 11:31:54 +0000 [thread overview]
Message-ID: <1331551914-28323-3-git-send-email-markwalters1009@gmail.com> (raw)
In-Reply-To: <1331551914-28323-1-git-send-email-markwalters1009@gmail.com>
One test using the new exclude code was failing in some
configurations. This patch makes it work for me. It may be a "fix"
but I do not see why it fixes it.
---
lib/query.cc | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/query.cc b/lib/query.cc
index ab18fbc..2b73d72 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -213,13 +213,14 @@ notmuch_query_search_messages (notmuch_query_t *query)
if (query->exclude_terms) {
exclude_query = _notmuch_exclude_tags (query, final_query);
- exclude_query = Xapian::Query (Xapian::Query::OP_AND,
- exclude_query, final_query);
if (query->omit_excluded_messages)
final_query = Xapian::Query (Xapian::Query::OP_AND_NOT,
final_query, exclude_query);
else {
+ exclude_query = Xapian::Query (Xapian::Query::OP_AND,
+ exclude_query, final_query);
+
enquire.set_weighting_scheme (Xapian::BoolWeight());
enquire.set_query (exclude_query);
--
1.7.9.1
next prev parent reply other threads:[~2012-03-12 11:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-12 11:31 [PATCH 0/2] A bug in the exclude code Mark Walters
2012-03-12 11:31 ` [PATCH 1/2] test: add tests for message only search Mark Walters
2012-03-12 20:06 ` Jameson Graef Rollins
2012-03-12 11:31 ` Mark Walters [this message]
2012-03-12 20:03 ` [PATCH 0/2] A bug in the exclude code Jameson Graef Rollins
2012-03-12 21:07 ` Mark Walters
2012-03-13 17:39 ` Jameson Graef Rollins
2012-03-14 2:08 ` Austin Clements
2012-03-14 11:12 ` Mark Walters
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331551914-28323-3-git-send-email-markwalters1009@gmail.com \
--to=markwalters1009@gmail.com \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).