From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 0F229431FD6 for ; Thu, 15 Mar 2012 11:42:13 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0.201 X-Spam-Level: X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, 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 0qbp+gyVxt7o for ; Thu, 15 Mar 2012 11:42:12 -0700 (PDT) Received: from mail-we0-f181.google.com (mail-we0-f181.google.com [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 28544431FAE for ; Thu, 15 Mar 2012 11:42:12 -0700 (PDT) Received: by mail-we0-f181.google.com with SMTP id m13so3528469wer.26 for ; Thu, 15 Mar 2012 11:42:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=xKCmup4gLeKkAACbdBvgh+KbOf04zAWD+zyXqm1NWwA=; b=YIxDMW4MXDvnBUKtTeJqXxaLzvZSWxh8xvL4h+jn6QJxTuONh8RG3QKhsEqBvE9H2t e3+50cg78z5WoRYU+ATRrxz2ORCmsT+GP0zOoTyiQOk/ZXYUywcetPeAf75b8B2VIJs+ 9qAW8nxBmzAnTiKb8lDHnLwMNY6c0J5KNuA+uiNmQiqXboxCsF8dFCSPPHNz1qYjbAsd AEPNiCUK5HamyIAs3VbkY9eMro4LrsZVzGjRjTPRlhkrRF+J5oNdRkm4lwaGlWBqwBfP j5f1HHFCZ3USCD3t5aG3TlgXw1rcOVMScGaVLLcLa6cAtIwzwaWkvmUgu8jxr5EqdXmJ XVSQ== Received: by 10.180.85.70 with SMTP id f6mr28973878wiz.5.1331836931746; Thu, 15 Mar 2012 11:42:11 -0700 (PDT) Received: from localhost (94-192-233-223.zone6.bethere.co.uk. [94.192.233.223]) by mx.google.com with ESMTPS id bg3sm7016438wib.10.2012.03.15.11.42.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 15 Mar 2012 11:42:10 -0700 (PDT) From: Mark Walters 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 Message-Id: <1331836925-31437-2-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1331836925-31437-1-git-send-email-markwalters1009@gmail.com> References: <1331836925-31437-1-git-send-email-markwalters1009@gmail.com> 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: Thu, 15 Mar 2012 18:42:13 -0000 --- 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