From 53dbcba9620aca7c0c18ca0cc8f30926314f482c Mon Sep 17 00:00:00 2001 From: David Bremner Date: Wed, 23 Mar 2016 07:54:53 +2100 Subject: [PATCH] [PATCH 12/13] lib: make a global constant for query parser flags --- 59/03b063cda27bec994d989ca60ea2f88e292114 | 121 ++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 59/03b063cda27bec994d989ca60ea2f88e292114 diff --git a/59/03b063cda27bec994d989ca60ea2f88e292114 b/59/03b063cda27bec994d989ca60ea2f88e292114 new file mode 100644 index 000000000..2cf3bb8bc --- /dev/null +++ b/59/03b063cda27bec994d989ca60ea2f88e292114 @@ -0,0 +1,121 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 0BBDC6DE0361 + for ; Tue, 22 Mar 2016 03:56:00 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.029 +X-Spam-Level: +X-Spam-Status: No, score=-0.029 tagged_above=-999 required=5 + tests=[AWL=-0.018, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] + 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 VkXr3PY6_VUd for ; + Tue, 22 Mar 2016 03:55:52 -0700 (PDT) +Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) + by arlo.cworth.org (Postfix) with ESMTPS id 8AEA26DE02AF + for ; Tue, 22 Mar 2016 03:55:23 -0700 (PDT) +Received: from remotemail by fethera.tethera.net with local (Exim 4.84) + (envelope-from ) + id 1aiJyh-00015O-2V; Tue, 22 Mar 2016 06:55:59 -0400 +Received: (nullmailer pid 14091 invoked by uid 1000); + Tue, 22 Mar 2016 10:55:11 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH 12/13] lib: make a global constant for query parser flags +Date: Tue, 22 Mar 2016 07:54:53 -0300 +Message-Id: <1458644094-13951-13-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.7.0 +In-Reply-To: <1458644094-13951-1-git-send-email-david@tethera.net> +References: <1458644094-13951-1-git-send-email-david@tethera.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +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: Tue, 22 Mar 2016 10:56:00 -0000 + +It's already kindof gross that this is hardcoded in two different +places. We will also need these later in field processors calling back +into the query parser. +--- + lib/database-private.h | 4 ++++ + lib/query.cc | 16 ++-------------- + 2 files changed, 6 insertions(+), 14 deletions(-) + +diff --git a/lib/database-private.h b/lib/database-private.h +index 30a045e..59708d0 100644 +--- a/lib/database-private.h ++++ b/lib/database-private.h +@@ -144,6 +144,10 @@ operator&=(_notmuch_features &a, _notmuch_features b) + return a; + } + ++#define NOTMUCH_QUERY_PARSER_FLAGS (Xapian::QueryParser::FLAG_BOOLEAN | Xapian::QueryParser::FLAG_PHRASE | \ ++ Xapian::QueryParser::FLAG_LOVEHATE | Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE | \ ++ Xapian::QueryParser::FLAG_WILDCARD | Xapian::QueryParser::FLAG_PURE_NOT) ++ + #if HAVE_XAPIAN_FIELD_PROCESSOR + class DateFieldProcessor; + #endif +diff --git a/lib/query.cc b/lib/query.cc +index e627bfc..972a389 100644 +--- a/lib/query.cc ++++ b/lib/query.cc +@@ -212,12 +212,6 @@ notmuch_query_search_messages_st (notmuch_query_t *query, + Xapian::Query string_query, final_query, exclude_query; + Xapian::MSet mset; + Xapian::MSetIterator iterator; +- unsigned int flags = (Xapian::QueryParser::FLAG_BOOLEAN | +- Xapian::QueryParser::FLAG_PHRASE | +- Xapian::QueryParser::FLAG_LOVEHATE | +- Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE | +- Xapian::QueryParser::FLAG_WILDCARD | +- Xapian::QueryParser::FLAG_PURE_NOT); + + if (strcmp (query_string, "") == 0 || + strcmp (query_string, "*") == 0) +@@ -225,7 +219,7 @@ notmuch_query_search_messages_st (notmuch_query_t *query, + final_query = mail_query; + } else { + string_query = notmuch->query_parser-> +- parse_query (query_string, flags); ++ parse_query (query_string, NOTMUCH_QUERY_PARSER_FLAGS); + final_query = Xapian::Query (Xapian::Query::OP_AND, + mail_query, string_query); + } +@@ -565,12 +559,6 @@ notmuch_query_count_messages_st (notmuch_query_t *query, unsigned *count_out) + "mail")); + Xapian::Query string_query, final_query, exclude_query; + Xapian::MSet mset; +- unsigned int flags = (Xapian::QueryParser::FLAG_BOOLEAN | +- Xapian::QueryParser::FLAG_PHRASE | +- Xapian::QueryParser::FLAG_LOVEHATE | +- Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE | +- Xapian::QueryParser::FLAG_WILDCARD | +- Xapian::QueryParser::FLAG_PURE_NOT); + + if (strcmp (query_string, "") == 0 || + strcmp (query_string, "*") == 0) +@@ -578,7 +566,7 @@ notmuch_query_count_messages_st (notmuch_query_t *query, unsigned *count_out) + final_query = mail_query; + } else { + string_query = notmuch->query_parser-> +- parse_query (query_string, flags); ++ parse_query (query_string, NOTMUCH_QUERY_PARSER_FLAGS); + final_query = Xapian::Query (Xapian::Query::OP_AND, + mail_query, string_query); + } +-- +2.7.0 + -- 2.26.2