This is not too useful yet, but provides gluing together queries in
various ways, which is actually one of the main motivations for
the s-expression query format.
---
lib/Makefile.local | 3 +-
lib/parse-sexp.cc | 92 +++++++++++++++++++++++++++++++++++++++
lib/parse-sexp.h | 6 +++
lib/query.cc | 7 ++-
test/T080-search.sh | 5 ---
test/T081-sexpr-search.sh | 34 +++++++++++++++
6 files changed, 137 insertions(+), 10 deletions(-)
create mode 100644 lib/parse-sexp.cc
create mode 100644 lib/parse-sexp.h
create mode 100755 test/T081-sexpr-search.sh
diff --git a/lib/Makefile.local b/lib/Makefile.local
index e2d4b91d..1378a74b 100644
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -63,7 +63,8 @@ libnotmuch_cxx_srcs = \
$(dir)/features.cc \
$(dir)/prefix.cc \
$(dir)/open.cc \
- $(dir)/init.cc
+ $(dir)/init.cc \
+ $(dir)/parse-sexp.cc
libnotmuch_modules := $(libnotmuch_c_srcs:.c=.o) $(libnotmuch_cxx_srcs:.cc=.o)
diff --git a/lib/parse-sexp.cc b/lib/parse-sexp.cc
new file mode 100644
index 00000000..dfbebf2b
--- /dev/null
+++ b/lib/parse-sexp.cc
@@ -0,0 +1,92 @@
+#include <xapian.h>
+#include "notmuch-private.h"
+#include "sexp.h"
+
+typedef struct {
+ const char *name;
+ Xapian::Query::op xapian_op;
+ Xapian::Query initial;
+} _sexp_op_t;
+
+static _sexp_op_t operations[] =
+{
+ { "and", Xapian::Query::OP_AND, Xapian::Query::MatchAll },
+ { "not", Xapian::Query::OP_AND_NOT, Xapian::Query::MatchAll },
+ { "or", Xapian::Query::OP_OR, Xapian::Query::MatchNothing },
+ { }
+};
+
+static notmuch_status_t _sexp_to_xapian_query (notmuch_database_t *notmuch,
const sexp_t *sx,
+ Xapian::Query &output);
+
+static notmuch_status_t
+_sexp_combine_query (notmuch_database_t *notmuch,
+ Xapian::Query::op operation,
+ Xapian::Query left,
+ const sexp_t *sx,
+ Xapian::Query &output)
+{
+ Xapian::Query subquery;
+
+ notmuch_status_t status;
+
+ /* if we run out elements, return accumulator */
+
+ if (! sx) {
+ output = left;
+ return NOTMUCH_STATUS_SUCCESS;
+ }
+
+ status = _sexp_to_xapian_query (notmuch, sx, subquery);
+ if (status)
+ return status;
+
+ return _sexp_combine_query (notmuch,
+ operation,
+ Xapian::Query (operation, left, subquery),
+ sx->next, output);
+}
+
+notmuch_status_t
+_notmuch_sexp_string_to_xapian_query (notmuch_database_t *notmuch, const char
*querystr,
+ Xapian::Query &output)
+{
+ const sexp_t *sx = NULL;
+ char *buf = talloc_strdup (notmuch, querystr);
+
+ sx = parse_sexp (buf, strlen (querystr));
+ if (! sx)
+ return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
+
+ return _sexp_to_xapian_query (notmuch, sx, output);
+}
+
+/* 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 */
+
+static notmuch_status_t
+_sexp_to_xapian_query (notmuch_database_t *notmuch, const sexp_t *sx,
Xapian::Query &output)
+{
+
+ const _sexp_op_t *op;
+
+ /* Currently we don't understand atoms */
+ assert (sx->ty == SEXP_LIST);
+
+ /* Empty list */
+ if (! sx->list) {
+ output = Xapian::Query::MatchAll;
+ return NOTMUCH_STATUS_SUCCESS;
+ }
+
+ for (op = operations; op && op->name; op++) {
+ if (strcasecmp (op->name, hd_sexp (sx)->val) == 0) {
+ return _sexp_combine_query (notmuch, op->xapian_op, op->initial,
sx->list->next, output);
+ }
+
+ }
+
+ _notmuch_database_log_append (notmuch, "unimplemented prefix %s\n",
sx->list->val);
+ return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
+}
diff --git a/lib/parse-sexp.h b/lib/parse-sexp.h
new file mode 100644
index 00000000..a358bf26
--- /dev/null
+++ b/lib/parse-sexp.h
@@ -0,0 +1,6 @@
+#ifndef _PARSE_SEXP_H
+#define _PARSE_SEXP_H
+/* parse_sexp.cc */
+notmuch_status_t _notmuch_sexp_string_to_xapian_query (notmuch_database_t
*notmuch, const
+ char *querystr,
Xapian::Query &output);
+#endif
diff --git a/lib/query.cc b/lib/query.cc
index d05bd193..a3cba662 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -20,11 +20,10 @@
#include "notmuch-private.h"
#include "database-private.h"
+#include "parse-sexp.h"
#include <glib.h> /* GHashTable, GPtrArray */
-#include "sexp.h"
-
typedef enum {
NOTMUCH_QUERY_SYNTAX_XAPIAN,
NOTMUCH_QUERY_SYNTAX_SEXPR,
@@ -195,8 +194,8 @@ _notmuch_query_ensure_parsed_sexpr (notmuch_query_t *query)
if (query->parsed)
return NOTMUCH_STATUS_SUCCESS;
- query->xapian_query = Xapian::Query::MatchAll;
- return NOTMUCH_STATUS_SUCCESS;
+ return _notmuch_sexp_string_to_xapian_query (query->notmuch,
query->query_string,
+ query->xapian_query);
}
static notmuch_status_t
diff --git a/test/T080-search.sh b/test/T080-search.sh
index 966e772a..a3f0dead 100755
--- a/test/T080-search.sh
+++ b/test/T080-search.sh
@@ -189,9 +189,4 @@ test_begin_subtest "parts do not have adjacent term
positions"
output=$(notmuch search id:termpos and '"c x"')
test_expect_equal "$output" ""
-test_begin_subtest "sexpr query: all messages"
-notmuch search '*' > EXPECTED
-notmuch search --query-syntax=sexp '()' > OUTPUT
-test_expect_equal_file EXPECTED OUTPUT
-
test_done
diff --git a/test/T081-sexpr-search.sh b/test/T081-sexpr-search.sh
new file mode 100755
index 00000000..41a82886
--- /dev/null
+++ b/test/T081-sexpr-search.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+test_description='"notmuch search" in several variations'
+. $(dirname "$0")/test-lib.sh || exit 1
+
+add_email_corpus
+
+for query in '()' '(not)' '(and)' '(or ())' '(or (not))' '(or (and))' \
+ '(or (and) (or) (not (and)))'; do
+ test_begin_subtest "all messages: $query"
+ notmuch search '*' > EXPECTED
+ notmuch search --query-syntax=sexp "$query" > OUTPUT
+ test_expect_equal_file EXPECTED OUTPUT
+done
+
+for query in '(or)' '(not ())' '(not (not))' '(not (and))' \
+ '(not (or (and) (or) (not (and))))'; do
+ test_begin_subtest "no messages: $query"
+ notmuch search --query-syntax=sexp "$query" > OUTPUT
+ test_expect_equal_file /dev/null OUTPUT
+done
+
+test_begin_subtest "Unbalanced parens"
+# A code 1 indicates the error was handled (a crash will return e.g. 139).
+test_expect_code 1 "notmuch search --query-syntax=sexp '('"
+
+test_begin_subtest "unknown_prefix"
+notmuch search --query-syntax=sexp '(foo)' >OUTPUT 2>&1
+cat <<EOF > EXPECTED
+notmuch search: Syntax error in query
+unimplemented prefix foo
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+test_done
--
2.30.2
_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org
