From: Mark Walters <markwalters1009@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH 1/5] lib: change default for notmuch_query_set_omit_excluded
Date: Thu, 15 Mar 2012 18:42:01 +0000 [thread overview]
Message-ID: <1331836925-31437-2-git-send-email-markwalters1009@gmail.com> (raw)
In-Reply-To: <1331836925-31437-1-git-send-email-markwalters1009@gmail.com>
---
lib/notmuch.h | 11 ++++++-----
lib/query.cc | 10 +++++-----
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/lib/notmuch.h b/lib/notmuch.h
index babd208..029a2c3 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -449,12 +449,13 @@ typedef enum {
const char *
notmuch_query_get_query_string (notmuch_query_t *query);
-/* Specify whether to results should omit the excluded results rather
- * than just marking them excluded. This is useful for passing a
- * notmuch_messages_t not containing the excluded messages to other
- * functions. */
+/* Specify whether to omit the excluded results or just flag
+ * them. Note when calling notmuch_query_search_threads, the returned
+ * thread will contain all messages regardless of this setting but,
+ * unless this is unset, only threads matching in a non-excluded
+ * message will be returned. */
void
-notmuch_query_set_omit_excluded_messages (notmuch_query_t *query, notmuch_bool_t omit);
+notmuch_query_set_omit_excluded_messages (notmuch_query_t *query, notmuch_bool_t omit_excluded);
/* Specify the sorting desired for this query. */
void
diff --git a/lib/query.cc b/lib/query.cc
index 2b73d72..44fc0ab 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -28,7 +28,7 @@ struct _notmuch_query {
const char *query_string;
notmuch_sort_t sort;
notmuch_string_list_t *exclude_terms;
- notmuch_bool_t omit_excluded_messages;
+ notmuch_bool_t omit_excluded;
};
typedef struct _notmuch_mset_messages {
@@ -86,7 +86,7 @@ notmuch_query_create (notmuch_database_t *notmuch,
query->exclude_terms = _notmuch_string_list_create (query);
- query->omit_excluded_messages = FALSE;
+ query->omit_excluded = TRUE;
return query;
}
@@ -98,9 +98,9 @@ notmuch_query_get_query_string (notmuch_query_t *query)
}
void
-notmuch_query_set_omit_excluded_messages (notmuch_query_t *query, notmuch_bool_t omit)
+notmuch_query_set_omit_excluded_messages (notmuch_query_t *query, notmuch_bool_t omit_excluded)
{
- query->omit_excluded_messages = omit;
+ query->omit_excluded = omit_excluded;
}
void
@@ -214,7 +214,7 @@ notmuch_query_search_messages (notmuch_query_t *query)
if (query->exclude_terms) {
exclude_query = _notmuch_exclude_tags (query, final_query);
- if (query->omit_excluded_messages)
+ if (query->omit_excluded)
final_query = Xapian::Query (Xapian::Query::OP_AND_NOT,
final_query, exclude_query);
else {
--
1.7.9.1
next prev parent reply other threads:[~2012-03-15 18:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-15 18:42 [PATCH 0/5] Move --no-exclude to --exclude=(true|false|flag) Mark Walters
2012-03-15 18:42 ` Mark Walters [this message]
2012-03-15 18:42 ` [PATCH 2/5] cli: move count to the new --exclude=(true|false|flag) naming scheme Mark Walters
2012-03-15 18:42 ` [PATCH 3/5] cli: move search to the new --exclude= " Mark Walters
2012-03-17 15:50 ` Austin Clements
2012-03-17 19:49 ` Jameson Graef Rollins
2012-03-18 17:23 ` [PATCH] test: add some exclude tests Mark Walters
2012-03-18 18:08 ` Jameson Graef Rollins
2012-03-15 18:42 ` [PATCH 4/5] cli: move show to the new --exclude= option naming scheme Mark Walters
2012-03-17 16:51 ` Austin Clements
2012-03-18 17:30 ` Mark Walters
2012-03-15 18:42 ` [PATCH 5/5] emacs: make show set --exclude=flag Mark Walters
2012-03-17 16:52 ` Austin Clements
2012-03-17 6:02 ` [PATCH 0/5] Move --no-exclude to --exclude=(true|false|flag) Jameson Graef Rollins
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=1331836925-31437-2-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).