debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-04 08:28:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: factor out expansion of saved queries.

Browse source 
This is intended to allow use outside of the Xapian query parser.
This commit is contained in:
David Bremner 2021-08-24 08:17:36 -07:00
parent a07ef8abf5
commit 036734252d
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/database-private.h
View file

@ -327,6 +327,11 @@ _notmuch_regexp_to_query (notmuch_database_t *notmuch, Xapian::valueno slot, std
std::string regexp_str, std::string regexp_str,
Xapian::Query &output, std::string &msg); Xapian::Query &output, std::string &msg);
/* thread-fp.cc */
notmuch_status_t
_notmuch_query_name_to_query (notmuch_database_t *notmuch, const std::string name,
Xapian::Query &output);
#if HAVE_SFSEXP #if HAVE_SFSEXP
/* parse-sexp.cc */ /* parse-sexp.cc */
notmuch_status_t notmuch_status_t

22
lib/query-fp.cc
View file

@ -24,17 +24,33 @@
#include "query-fp.h" #include "query-fp.h"
#include <iostream> #include <iostream>
Xapian::Query notmuch_status_t
QueryFieldProcessor::operator() (const std::string & name) _notmuch_query_name_to_query (notmuch_database_t *notmuch, const std::string name,
Xapian::Query &output)
{ {
std::string key = "query." + name; std::string key = "query." + name;
char *expansion; char *expansion;
notmuch_status_t status; notmuch_status_t status;
status = notmuch_database_get_config (notmuch, key.c_str (), &expansion); status = notmuch_database_get_config (notmuch, key.c_str (), &expansion);
if (status)
return status;
output = notmuch->query_parser->parse_query (expansion, NOTMUCH_QUERY_PARSER_FLAGS);
return NOTMUCH_STATUS_SUCCESS;
}
Xapian::Query
QueryFieldProcessor::operator() (const std::string & name)
{
notmuch_status_t status;
Xapian::Query output;
status = _notmuch_query_name_to_query (notmuch, name, output);
if (status) { if (status) {
throw Xapian::QueryParserError ("error looking up key" + name); throw Xapian::QueryParserError ("error looking up key" + name);
} }
return parser.parse_query (expansion, NOTMUCH_QUERY_PARSER_FLAGS); return output;
} }