[RFC patch 3/5] lib: setup user headers in query parser

[David Bremner]

These tests will need to be updated if the Xapian
query print/debug format changes.
---
 lib/database.cc          | 40 ++++++++++++++++++++++++++++++++++++++++
 test/T720-user-header.sh | 21 +++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/lib/database.cc b/lib/database.cc
index 9cf8062c..fa77eb91 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -299,6 +299,8 @@ prefix_t prefix_table[] = {
 						NOTMUCH_FIELD_PROCESSOR},
 };
 
+#define CONFIG_HEADER_PREFIX "index.header."
+
 static void
 _setup_query_field_default (const prefix_t *prefix, notmuch_database_t *notmuch)
 {
@@ -308,6 +310,43 @@ _setup_query_field_default (const prefix_t *prefix, notmuch_database_t *notmuch)
 	notmuch->query_parser->add_boolean_prefix (prefix->name, prefix->prefix);
 }
 
+static notmuch_status_t
+_setup_user_query_fields (notmuch_database_t *notmuch)
+{
+    notmuch_config_list_t *list;
+    void *local = talloc_new(notmuch);
+    notmuch_status_t status;
+
+    status = notmuch_database_get_config_list (notmuch, "index.header.", &list);
+    if (status)
+	return status;
+    for (; notmuch_config_list_valid (list); notmuch_config_list_move_to_next (list)) {
+
+	prefix_t query_field { .name = NULL, .prefix = NULL,
+		.flags = NOTMUCH_FIELD_PROBABILISTIC |
+			 NOTMUCH_FIELD_EXTERNAL
+		};
+
+	const char *key = notmuch_config_list_key (list)
+	    + sizeof (CONFIG_HEADER_PREFIX) - 1;
+
+	char *prefix = talloc_asprintf(local, "XU:%s", key);
+	for (char *p = prefix + 1; *p; p++)
+	    *p = toupper (*p);
+
+	query_field.name = key;
+	query_field.prefix = prefix;
+
+	_setup_query_field_default (&query_field, notmuch);
+    }
+
+    talloc_free (local);
+
+    notmuch_config_list_destroy (list);
+
+    return NOTMUCH_STATUS_SUCCESS;
+}
+
 #if HAVE_XAPIAN_FIELD_PROCESSOR
 static void
 _setup_query_field (const prefix_t *prefix, notmuch_database_t *notmuch)
@@ -965,6 +1004,7 @@ notmuch_database_open_verbose (const char *path,
 		_setup_query_field (prefix, notmuch);
 	    }
 	}
+	status = _setup_user_query_fields (notmuch);
     } catch (const Xapian::Error &error) {
 	IGNORE_RESULT (asprintf (&message, "A Xapian exception occurred opening database: %s\n",
 				 error.get_msg().c_str()));
diff --git a/test/T720-user-header.sh b/test/T720-user-header.sh
index 774bad2f..ab4d4712 100755
--- a/test/T720-user-header.sh
+++ b/test/T720-user-header.sh
@@ -35,4 +35,25 @@ index.header.spam=X-Spam
 EOF
 test_expect_equal_file EXPECTED OUTPUT
 
+test_begin_subtest "parse user prefix"
+NOTMUCH_DEBUG_QUERY=t notmuch count 'list:"notmuch"' 2>&1 | grep Tmail >OUTPUT
+cat <<EOF > EXPECTED
+Query((Tmail AND XU:LISTnotmuch at 1))
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "parse user prefix, stemmed"
+NOTMUCH_DEBUG_QUERY=t notmuch count 'list:notmuch' 2>&1 | grep Tmail >OUTPUT
+cat <<EOF > EXPECTED
+Query((Tmail AND ZXU:LISTnotmuch at 1))
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "parse user prefix, phrase"
+NOTMUCH_DEBUG_QUERY=t notmuch count 'list:notmuchmail.org' 2>&1 | grep Tmail >OUTPUT
+cat <<EOF > EXPECTED
+Query((Tmail AND (XU:LISTnotmuchmail at 1 PHRASE 2 XU:LISTorg at 2)))
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
 test_done
-- 
2.19.1