From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 8B31M2tl6WEwXAEAgWs5BA (envelope-from ) for ; Thu, 20 Jan 2022 14:36:43 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id KJltMGtl6WEdfAEAauVa8A (envelope-from ) for ; Thu, 20 Jan 2022 14:36:43 +0100 Received: from mail.notmuchmail.org (yantan.tethera.net [IPv6:2a01:4f9:c011:7a79::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7782E3C3E8 for ; Thu, 20 Jan 2022 14:36:43 +0100 (CET) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 341295F72B; Thu, 20 Jan 2022 13:36:19 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id DEEF45F71A for ; Thu, 20 Jan 2022 13:36:16 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 4EF505FC87; Thu, 20 Jan 2022 08:36:15 -0500 (EST) Received: (nullmailer pid 31634 invoked by uid 1000); Thu, 20 Jan 2022 13:36:08 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH v2 2/6] lib/parse-sexp: support zero argument date queries Date: Thu, 20 Jan 2022 09:36:01 -0400 Message-Id: <20220120133605.31401-3-david@tethera.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120133605.31401-1-david@tethera.net> References: <20220120133605.31401-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: IPGIHZKFHOPJMVG2K4E7QMFR2EJ2NFCX X-Message-ID-Hash: IPGIHZKFHOPJMVG2K4E7QMFR2EJ2NFCX X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1642685803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post; bh=VlHBfXzY/COlaFklhTUOmeuYKaBBcYpuOBma2bq8VJU=; b=CJGvOos7XcL6yO4cNqE9tVJDce4zBJPdhCw5+ZlLwKTkziaTMxvzC3tXcBdaNqc/vz31dl lGOU0O7Ltr7ffAYsRlv1qmPG98Uil8x6swd5o/OJrT8lXSJY2NIL7Mrq0jXdDaxswIQrDl W25qScIh4z12njZcRTaiO2gqDtKi4w4sADo6E2gVPOIKmDNMZBcqLPoiKtnGiophYzK8Ex QLMIdWOMgb/hOJvJsLCaBk3aH+wKAKJEHmm+LAhCaaa+bC8kEeeinWTmaMP9J5hxurc35l 9aOWswPaKL0BsO1mDXQJW6QYwRSnlavaGR8eYpO2cHfIdZLIqXT2TDrZ9t81Fw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1642685803; a=rsa-sha256; cv=none; b=IsmBhNWj9BY6f8AGNHaAqFsxB9OhKV0tezDGp/j+RtA57VQF4dHKu+Z6uQT54Of80A45sU z4iYdb+WcXnj21zP8epdxRPduJ+MccNw95ShaW0LK/3wFHHzgE5N6AhHITharO2RA/xjwX aZvwDyUQgvqaGAkyOVezkRaLs7MpHTf0lYYWZ+/tgPzeNmxezV4OYBGYhlxDMXdIemZOnc RrhCRhSM1TMu6tDYNujaveW5FCxnD5R32BpObOtJqI5kGSiDF05cxBFsS3319WDpbI2s5a 0Ysfgb1WKpe+OitT2FSaTlwvUB0SoLfMvoKkKw3TyJDVN0YEi+SBuDEogqC2Zg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.82 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 7782E3C3E8 X-Spam-Score: -1.82 X-Migadu-Scanner: scn0.migadu.com X-TUID: 1puu2pVZ94k5 These are not too practical, although they may simplify some user query generation code. Mainly this adds a new prefix keyword to the parser. --- lib/parse-sexp.cc | 22 +++++++++++++++++++++- test/T081-sexpr-search.sh | 3 --- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/lib/parse-sexp.cc b/lib/parse-sexp.cc index 356c32ea..f36d18a6 100644 --- a/lib/parse-sexp.cc +++ b/lib/parse-sexp.cc @@ -32,6 +32,7 @@ typedef enum { SEXP_FLAG_EXPAND = 1 << 6, SEXP_FLAG_DO_EXPAND = 1 << 7, SEXP_FLAG_ORPHAN = 1 << 8, + SEXP_FLAG_RANGE = 1 << 9, } _sexp_flag_t; /* @@ -66,6 +67,8 @@ static _sexp_prefix_t prefixes[] = SEXP_FLAG_FIELD | SEXP_FLAG_WILDCARD | SEXP_FLAG_EXPAND }, { "body", Xapian::Query::OP_AND, Xapian::Query::MatchAll, SEXP_FLAG_FIELD }, + { "date", Xapian::Query::OP_INVALID, Xapian::Query::MatchAll, + SEXP_FLAG_RANGE }, { "from", Xapian::Query::OP_AND, Xapian::Query::MatchAll, SEXP_FLAG_FIELD | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND }, { "folder", Xapian::Query::OP_OR, Xapian::Query::MatchNothing, @@ -446,6 +449,19 @@ _sexp_expand_param (notmuch_database_t *notmuch, const _sexp_prefix_t *parent, return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; } +static notmuch_status_t +_sexp_parse_date (notmuch_database_t *notmuch, const sexp_t *sx, Xapian::Query &output) +{ + /* empty date matches everything */ + if (! sx) { + output = Xapian::Query::MatchAll; + return NOTMUCH_STATUS_SUCCESS; + } + + _notmuch_database_log (notmuch, "unimplemented date query\n"); + return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; +} + /* Here we expect the s-expression to be a proper list, with first * element defining and operation, or as a special case the empty * list */ @@ -519,7 +535,7 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent for (_sexp_prefix_t *prefix = prefixes; prefix && prefix->name; prefix++) { if (strcmp (prefix->name, sx->list->val) == 0) { - if (prefix->flags & SEXP_FLAG_FIELD) { + if (prefix->flags & (SEXP_FLAG_FIELD | SEXP_FLAG_RANGE)) { if (parent) { _notmuch_database_log (notmuch, "nested field: '%s' inside '%s'\n", prefix->name, parent->name); @@ -541,6 +557,10 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; } + if (strcmp (prefix->name, "date") == 0) { + return _sexp_parse_date (notmuch, sx->list->next, output); + } + if (strcmp (prefix->name, "infix") == 0) { return _sexp_parse_infix (notmuch, sx->list->next, output); } diff --git a/test/T081-sexpr-search.sh b/test/T081-sexpr-search.sh index d8f8872d..a6e2ee82 100755 --- a/test/T081-sexpr-search.sh +++ b/test/T081-sexpr-search.sh @@ -769,7 +769,6 @@ notmuch search --query=sexp '(and (infix "date:2009-11-18..2009-11-18") (infix test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "date query, empty" -test_subtest_known_broken notmuch search from:keithp | notmuch_search_sanitize > EXPECTED notmuch search --query=sexp '(and (date) (from keithp))'| notmuch_search_sanitize > OUTPUT test_expect_equal_file EXPECTED OUTPUT @@ -787,7 +786,6 @@ notmuch search --query=sexp '(and (date 2009-11-17 2009-11-18) (from keithp))' test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "date query, illegal nesting 1" -test_subtest_known_broken notmuch search --query=sexp '(to (date))' > OUTPUT 2>&1 cat < EXPECTED notmuch search: Syntax error in query @@ -796,7 +794,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "date query, illegal nesting 2" -test_subtest_known_broken notmuch search --query=sexp '(to (date 2021-11-18))' > OUTPUT 2>&1 cat < EXPECTED notmuch search: Syntax error in query -- 2.34.1