From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 5AF426DE1097 for ; Sat, 2 Mar 2019 07:41:55 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.009 X-Spam-Level: X-Spam-Status: No, score=-0.009 tagged_above=-999 required=5 tests=[AWL=-0.008, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4mNo07GefH39 for ; Sat, 2 Mar 2019 07:41:54 -0800 (PST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id BE4746DE1098 for ; Sat, 2 Mar 2019 07:41:45 -0800 (PST) Received: from remotemail by fethera.tethera.net with local (Exim 4.89) (envelope-from ) id 1h06lk-0004JZ-T9; Sat, 02 Mar 2019 10:41:44 -0500 Received: (nullmailer pid 25726 invoked by uid 1000); Sat, 02 Mar 2019 15:41:37 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 3/7] lib: setup user headers in query parser Date: Sat, 2 Mar 2019 11:41:29 -0400 Message-Id: <20190302154133.25642-4-david@tethera.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190302154133.25642-1-david@tethera.net> References: <20190302154133.25642-1-david@tethera.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Mar 2019 15:41:55 -0000 These tests will need to be updated if the Xapian query print/debug format changes. --- lib/database.cc | 35 +++++++++++++++++++++++++++++++++++ test/T730-user-header.sh | 21 +++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/lib/database.cc b/lib/database.cc index 9cf8062c..4de79f79 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,38 @@ _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; + notmuch_status_t status; + + status = notmuch_database_get_config_list (notmuch, CONFIG_HEADER_PREFIX, &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(notmuch, "XU%s:", key); + + query_field.name = key; + query_field.prefix = prefix; + + _setup_query_field_default (&query_field, notmuch); + } + + 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 +999,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/T730-user-header.sh b/test/T730-user-header.sh index ad32a5b4..1531f1d6 100755 --- a/test/T730-user-header.sh +++ b/test/T730-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 < EXPECTED +Query((Tmail AND XUlist:notmuch@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 < EXPECTED +Query((Tmail AND ZXUlist:notmuch@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 < EXPECTED +Query((Tmail AND (XUlist:notmuchmail@1 PHRASE 2 XUlist:org@2))) +EOF +test_expect_equal_file EXPECTED OUTPUT + test_done -- 2.20.1