unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 02/25] lib: split notmuch_query_create
Date: Sat, 17 Jul 2021 23:39:58 -0300	[thread overview]
Message-ID: <20210718024021.3850340-3-david@tethera.net> (raw)
In-Reply-To: <20210718024021.3850340-1-david@tethera.net>

Most of the function will be re-usable when creating a query from an
s-expression.
---
 lib/query.cc | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/query.cc b/lib/query.cc
index 792aba21..39b85e91 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -84,9 +84,9 @@ _notmuch_query_destructor (notmuch_query_t *query)
     return 0;
 }
 
-notmuch_query_t *
-notmuch_query_create (notmuch_database_t *notmuch,
-		      const char *query_string)
+static notmuch_query_t *
+_notmuch_query_constructor (notmuch_database_t *notmuch,
+			    const char *query_string)
 {
     notmuch_query_t *query;
 
@@ -116,6 +116,19 @@ notmuch_query_create (notmuch_database_t *notmuch,
     return query;
 }
 
+notmuch_query_t *
+notmuch_query_create (notmuch_database_t *notmuch,
+		      const char *query_string)
+{
+
+    notmuch_query_t *query = _notmuch_query_constructor (notmuch, query_string);
+
+    if (! query)
+	return NULL;
+
+    return query;
+}
+
 static notmuch_status_t
 _notmuch_query_ensure_parsed (notmuch_query_t *query)
 {
-- 
2.30.2

  parent reply	other threads:[~2021-07-18  2:41 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-18  2:39 v2 sexpr parser David Bremner
2021-07-18  2:39 ` [PATCH 01/25] configure: optional library sfsexp David Bremner
2021-07-18  2:39 ` David Bremner [this message]
2021-07-18  2:39 ` [PATCH 03/25] lib: define notmuch_query_create_sexpr David Bremner
2021-07-18  2:40 ` [PATCH 04/25] CLI/search+address: support sexpr queries David Bremner
2021-07-18  2:40 ` [PATCH 05/25] lib: add new status code for query syntax errors David Bremner
2021-07-18  2:40 ` [PATCH 06/25] lib/parse-sexp: parse 'and', 'not', 'or' David Bremner
2021-07-18  2:40 ` [PATCH 07/25] lib/parse-sexp: parse 'subject' David Bremner
2021-07-18  2:40 ` [PATCH 08/25] lib/parse-sexp: split terms in phrase mode David Bremner
2021-07-18  2:40 ` [PATCH 09/25] lib/parse-sexp: handle most fields David Bremner
2021-07-18  2:40 ` [PATCH 10/25] lib/parse-sexp: handle unprefixed terms David Bremner
2021-07-18  2:40 ` [PATCH 11/25] lib: factor out date to query conversion David Bremner
2021-07-18  2:40 ` [PATCH 12/25] lib/parse-sexp: parse date fields David Bremner
2021-07-18  2:40 ` [PATCH 13/25] lib: factor out expansion of saved queries David Bremner
2021-07-18  2:40 ` [PATCH 14/25] lib/parse-sexp: handle " David Bremner
2021-07-18  2:40 ` [PATCH 15/25] lib/parse-sexp: add keyword arguments for fields David Bremner
2021-07-18  2:40 ` [PATCH 16/25] lib/parse-sexp: initial support for wildcard queries David Bremner
2021-07-18  2:40 ` [PATCH 17/25] lib/query: generalize exclude handling to s-expression queries David Bremner
2021-07-18  2:40 ` [PATCH 18/25] lib: factor out query construction from regexp David Bremner
2021-07-18  2:40 ` [PATCH 19/25] lib/parse-sexp: add support for regexp fields David Bremner
2021-07-18  2:40 ` [PATCH 20/25] lib/thread-fp: factor out query expansion David Bremner
2021-07-18  2:40 ` [PATCH 21/25] lib: define _notmuch_query_from_sexp David Bremner
2021-07-18  2:40 ` [PATCH 22/25] lib: generate actual Xapian query for "*" and "" David Bremner
2021-07-18  2:40 ` [PATCH 23/25] lib/parse-sexp: support thread subqueries David Bremner
2021-07-18  2:40 ` [PATCH 24/25] lib/parse-sexp: support infix subqueries David Bremner
2021-07-18  2:40 ` [PATCH 25/25] lib/parse-sexp: parse user headers David Bremner

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=20210718024021.3850340-3-david@tethera.net \
    --to=david@tethera.net \
    --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).