From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id eI8EIVZl6WHySgEAgWs5BA (envelope-from ) for ; Thu, 20 Jan 2022 14:36:22 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id aBupGVZl6WGvDwAAG6o9tA (envelope-from ) for ; Thu, 20 Jan 2022 14:36:22 +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 294952FF80 for ; Thu, 20 Jan 2022 14:36:22 +0100 (CET) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 2BAF25F70E; Thu, 20 Jan 2022 13:36:14 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 3B6FC5F6EC for ; Thu, 20 Jan 2022 13:36:11 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id A4C615FC01; Thu, 20 Jan 2022 08:36:10 -0500 (EST) Received: (nullmailer pid 31640 invoked by uid 1000); Thu, 20 Jan 2022 13:36:08 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH v2 4/6] lib/parse-sexp: support actual date queries. Date: Thu, 20 Jan 2022 09:36:03 -0400 Message-Id: <20220120133605.31401-5-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: DEI24K6NLV2QHLSQMPJCPHSPE4RITJJO X-Message-ID-Hash: DEI24K6NLV2QHLSQMPJCPHSPE4RITJJO 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=1642685782; 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=iXHSXNLPI/p2mAvhFGu1YXcPGtsvVbhGQVN5HMTJkmM=; b=DvKTi9CfkZ46sURmywTZjsQyipXY2oPx+P+68362ytu+Ul8q+dNAOJTZ5jLIadWsYhtDkx v9aqQZjL4dRyc1QmXZRS3/qeABHemO+arbZVSIlnPGisAltJVmNnVC8CVvv0jd4G9t9lne 4kmW4vVr2F/krRUy408rLjBdv1qL3ldvPkMpN1s/PNwldpNO39EWxJga9LaRakjee29P6u 2/tp2RzwSZ351ohP+7YU1Ka1mSIwIs1aesnrOcwWYNej8y4gufEnrhZYGNzaApWOwF3y6r wQyriB4IKDGVIs95v+aSKSVFvJUYGsAGC/rmXvwVCfgC9O86lub1EpNUlvhK0A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1642685782; a=rsa-sha256; cv=none; b=niD4LJndA0OZ1y9N+kmfHc1MD96t/1wdfC1I3TINXft0rBc8LieDbxBEwBaTj0o3HPsti2 oM26SYwRR8UCFEMVlPSNHl9Y07Uy0BN6WElBek+n1ibpC4Sxo0OHFsClnR1MlSL+H3Bjqa uZ6O0RwC/x9j+scKdio578l9ugYE//ya0Lf51OwPIkh+C2KmKCejnrZsKR+SK2IqgKCINs dMRdMdx/N6upJ0AXgX5DTf0i0cphNE7P8KPaTRrdU29lBga9VrG4iWpNmWn7qZkvYgbsys WOG0zprAJHuueY7dJtEF9H6hlAm0+bEwA+A45Te3Ro7c09/wtqO70G7Dwo/Nig== 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: -2.32 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: 294952FF80 X-Spam-Score: -2.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: vscyRugjrWKD The default argument processing overlaps somewhat with what is already done in _notmuch_date_strings_to_query, but we can give more specific error messages for the s-expression context. The extra generality of _sexp_parse_range will be useful when we implement additional range prefixes (at least 'lastmod' is needed). --- lib/parse-sexp.cc | 48 ++++++++++++++++++++++++++++++++++----- test/T081-sexpr-search.sh | 6 ----- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/lib/parse-sexp.cc b/lib/parse-sexp.cc index f36d18a6..dbc3f89d 100644 --- a/lib/parse-sexp.cc +++ b/lib/parse-sexp.cc @@ -450,15 +450,52 @@ _sexp_expand_param (notmuch_database_t *notmuch, const _sexp_prefix_t *parent, } static notmuch_status_t -_sexp_parse_date (notmuch_database_t *notmuch, const sexp_t *sx, Xapian::Query &output) +_sexp_parse_range (notmuch_database_t *notmuch, const _sexp_prefix_t *prefix, + const sexp_t *sx, Xapian::Query &output) { - /* empty date matches everything */ + const char *from, *to; + std::string msg; + + /* empty range matches everything */ if (! sx) { output = Xapian::Query::MatchAll; return NOTMUCH_STATUS_SUCCESS; } - _notmuch_database_log (notmuch, "unimplemented date query\n"); + if (sx->ty == SEXP_LIST) { + _notmuch_database_log (notmuch, "expected atom as first argument of '%s'\n", prefix->name); + return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; + } + + from = sx->val; + to = from; + + if (sx->next) { + if (sx->next->ty == SEXP_LIST) { + _notmuch_database_log (notmuch, "expected atom as second argument of '%s'\n", + prefix->name); + return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; + } + + if (sx->next->next) { + _notmuch_database_log (notmuch, "'%s' expects maximum of two arguments\n", prefix->name); + return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; + } + + to = sx->next->val; + } + + if (strcmp (prefix->name, "date") == 0) { + notmuch_status_t status; + status = _notmuch_date_strings_to_query (NOTMUCH_VALUE_TIMESTAMP, from, to, output, msg); + if (status) { + if (! msg.empty ()) + _notmuch_database_log (notmuch, "%s\n", msg.c_str ()); + } + return status; + } + + _notmuch_database_log (notmuch, "unimplimented range prefix: '%s'\n", prefix->name); return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; } @@ -557,9 +594,8 @@ _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 (prefix->flags & SEXP_FLAG_RANGE) + return _sexp_parse_range (notmuch, prefix, 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 a6e2ee82..32b30493 100755 --- a/test/T081-sexpr-search.sh +++ b/test/T081-sexpr-search.sh @@ -774,13 +774,11 @@ notmuch search --query=sexp '(and (date) (from keithp))'| notmuch_search_saniti test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "date query, one argument" -test_subtest_known_broken notmuch search date:2009-11-18 and from:keithp | notmuch_search_sanitize > EXPECTED notmuch search --query=sexp '(and (date 2009-11-18) (from keithp))' | notmuch_search_sanitize > OUTPUT test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "date query, two arguments" -test_subtest_known_broken notmuch search date:2009-11-17..2009-11-18 and from:keithp | notmuch_search_sanitize > EXPECTED notmuch search --query=sexp '(and (date 2009-11-17 2009-11-18) (from keithp))' | notmuch_search_sanitize > OUTPUT test_expect_equal_file EXPECTED OUTPUT @@ -802,7 +800,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "date query, illegal nesting 3" -test_subtest_known_broken notmuch search --query=sexp '(date (to))' > OUTPUT 2>&1 cat < EXPECTED notmuch search: Syntax error in query @@ -811,7 +808,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "date query, illegal nesting 4" -test_subtest_known_broken notmuch search --query=sexp '(date today (to))' > OUTPUT 2>&1 cat < EXPECTED notmuch search: Syntax error in query @@ -820,7 +816,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "date query, too many arguments" -test_subtest_known_broken notmuch search --query=sexp '(date yesterday and tommorow)' > OUTPUT 2>&1 cat < EXPECTED notmuch search: Syntax error in query @@ -829,7 +824,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "date query, bad date" -test_subtest_known_broken notmuch search --query=sexp '(date "hawaiian-pizza-day")' > OUTPUT 2>&1 cat < EXPECTED notmuch search: Syntax error in query -- 2.34.1