alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib: rename support-ngrams => ngrams-enabled

Browse Source 
For consistency.
This commit is contained in:
Dirk-Jan C. Binnema
2026-07-22 17:34:13 +03:00
committed by Seth Ladygo
parent a347d3ada0
commit d24347bad6
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/message/mu-document.cc
View File

@ -79,7 +79,7 @@ make_term_generator(Xapian::Document& doc, Document::Options opts)
{ {
Xapian::TermGenerator termgen; Xapian::TermGenerator termgen;
if (any_of(opts & Document::Options::SupportNgrams)) if (any_of(opts & Document::Options::NgramsEnabled))
termgen.set_flags(Xapian::TermGenerator::FLAG_NGRAMS); termgen.set_flags(Xapian::TermGenerator::FLAG_NGRAMS);
termgen.set_document(doc); termgen.set_document(doc);

2
lib/message/mu-document.hh
View File

@ -43,7 +43,7 @@ class Document {
public: public:
enum struct Options { enum struct Options {
None = 0, None = 0,
SupportNgrams = 1 << 0, /**< Support ngrams, as used in NgramsEnabled = 1 << 0, /**< Support ngrams, as used in
* CJK and other languages. */ * CJK and other languages. */
}; };

4
lib/message/mu-message.cc
View File

@ -78,8 +78,8 @@ struct Message::Private {
private: private:
Document::Options doc_opts(Message::Options mopts) { Document::Options doc_opts(Message::Options mopts) {
return any_of(opts & Message::Options::SupportNgrams) ? return any_of(opts & Message::Options::NgramsEnabled) ?
Document::Options::SupportNgrams : Document::Options::NgramsEnabled :
Document::Options::None; Document::Options::None;
} }
}; };

2
lib/message/mu-message.hh
View File

@ -52,7 +52,7 @@ public:
* access) */ * access) */
AllowRelativePath = 1 << 2, /**< Allow relative paths for filename AllowRelativePath = 1 << 2, /**< Allow relative paths for filename
* in make_from_path */ * in make_from_path */
SupportNgrams = 1 << 3, /**< Support ngrams, as used in NgramsEnabled = 1 << 3, /**< Support ngrams, as used in
* CJK and other languages. */ * CJK and other languages. */
}; };

2
lib/mu-query-parser.hh
View File

@ -103,7 +103,7 @@ Sexp parse_query(const std::string& expr, bool expand=false);
*/ */
enum struct ParserFlags { enum struct ParserFlags {
None = 0 << 0, None = 0 << 0,
SupportNgrams = 1 << 0, /**< Support Xapian's Ngrams for CJK etc. handling */ NgramsEnabled = 1 << 0, /**< Support Xapian's Ngrams for CJK etc. handling */
XapianParser = 1 << 1, /**< For testing only, use Xapian's XapianParser = 1 << 1, /**< For testing only, use Xapian's
* built-in QueryParser; this is not * built-in QueryParser; this is not
* fully compatible with mu, only useful * fully compatible with mu, only useful

4
lib/mu-query-xapianizer.cc
View File

@ -256,7 +256,7 @@ parse_field_matcher(const Store& store, const Field& field,
static Result<Xapian::Query> static Result<Xapian::Query>
parse_basic(const Field &field, Sexp &&vals, Mu::ParserFlags flags) parse_basic(const Field &field, Sexp &&vals, Mu::ParserFlags flags)
{ {
auto ngrams = any_of(flags & ParserFlags::SupportNgrams); auto ngrams = any_of(flags & ParserFlags::NgramsEnabled);
if (!vals.stringp()) if (!vals.stringp())
return Err(Error::Code::InvalidArgument, "expected string"); return Err(Error::Code::InvalidArgument, "expected string");
@ -360,7 +360,7 @@ xapian_query_classic(const std::string& expr, Mu::ParserFlags flags)
Xapian::QueryParser::FLAG_BOOLEAN | Xapian::QueryParser::FLAG_BOOLEAN |
Xapian::QueryParser::FLAG_WILDCARD; Xapian::QueryParser::FLAG_WILDCARD;
if (any_of(flags & ParserFlags::SupportNgrams)) if (any_of(flags & ParserFlags::NgramsEnabled))
xflags |= Xapian::QueryParser::FLAG_NGRAMS; xflags |= Xapian::QueryParser::FLAG_NGRAMS;
xqp.set_default_op(Xapian::Query::OP_AND); xqp.set_default_op(Xapian::Query::OP_AND);

6
lib/mu-query.cc
View File

@ -28,8 +28,8 @@ using namespace Mu;
struct Query::Private { struct Query::Private {
explicit Private(const Store& store) : explicit Private(const Store& store) :
store_{store}, store_{store},
parser_flags_{any_of(store_.message_options() & Message::Options::SupportNgrams) ? parser_flags_{any_of(store_.message_options() & Message::Options::NgramsEnabled) ?
ParserFlags::SupportNgrams : ParserFlags::None} {} ParserFlags::NgramsEnabled : ParserFlags::None} {}
Xapian::Enquire make_enquire(const std::string& expr, Field::Id sortfield_id, Xapian::Enquire make_enquire(const std::string& expr, Field::Id sortfield_id,
QueryFlags qflags) const; QueryFlags qflags) const;
@ -253,7 +253,7 @@ Query::run(const std::string& expr, Field::Id sortfield_id,
expr, expr,
any_of(qflags & QueryFlags::IncludeRelated) ? "yes" : "no", any_of(qflags & QueryFlags::IncludeRelated) ? "yes" : "no",
any_of(qflags & QueryFlags::Threading) ? "yes" : "no", any_of(qflags & QueryFlags::Threading) ? "yes" : "no",
any_of(priv_->parser_flags_ & ParserFlags::SupportNgrams) ? "yes" : "no", any_of(priv_->parser_flags_ & ParserFlags::NgramsEnabled) ? "yes" : "no",
maxnum == 0 ? std::string{"∞"} : std::to_string(maxnum))}; maxnum == 0 ? std::string{"∞"} : std::to_string(maxnum))};
return xapian_try_result([&]{ return xapian_try_result([&]{