X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fregexp-fields.cc;h=0feb50e586ba84f1c4ef84cb62e78ea679b472c3;hp=5d4cf80aeea6f145630002c45ac31c4bda5f526c;hb=b90d852a2fb377d5b7db4ab2ac389964f8c0c3b3;hpb=d25dcc589ce4c1a87d698c6aef1ce3e38e4a50bb diff --git a/lib/regexp-fields.cc b/lib/regexp-fields.cc index 5d4cf80a..0feb50e5 100644 --- a/lib/regexp-fields.cc +++ b/lib/regexp-fields.cc @@ -26,7 +26,6 @@ #include "notmuch-private.h" #include "database-private.h" -#if HAVE_XAPIAN_FIELD_PROCESSOR static void compile_regex (regex_t ®exp, const char *str) { @@ -124,12 +123,13 @@ bool RegexpPostingSource::check (Xapian::docid did, unused (double min_wt)) { started_ = true; - if (!it_.check (did) || at_end ()) + if (! it_.check (did) || at_end ()) return false; return (regexec (®exp_, (*it_).c_str (), 0, NULL, 0) == 0); } -static inline Xapian::valueno _find_slot (std::string prefix) +static inline Xapian::valueno +_find_slot (std::string prefix) { if (prefix == "from") return NOTMUCH_VALUE_FROM; @@ -145,11 +145,11 @@ RegexpFieldProcessor::RegexpFieldProcessor (std::string prefix, notmuch_field_flag_t options_, Xapian::QueryParser &parser_, notmuch_database_t *notmuch_) - : slot (_find_slot (prefix)), - term_prefix (_find_prefix (prefix.c_str ())), - options (options_), - parser (parser_), - notmuch (notmuch_) + : slot (_find_slot (prefix)), + term_prefix (_find_prefix (prefix.c_str ())), + options (options_), + parser (parser_), + notmuch (notmuch_) { }; @@ -158,17 +158,17 @@ RegexpFieldProcessor::operator() (const std::string & str) { if (str.empty ()) { if (options & NOTMUCH_FIELD_PROBABILISTIC) { - return Xapian::Query(Xapian::Query::OP_AND_NOT, - Xapian::Query::MatchAll, - Xapian::Query (Xapian::Query::OP_WILDCARD, term_prefix)); + return Xapian::Query (Xapian::Query::OP_AND_NOT, + Xapian::Query::MatchAll, + Xapian::Query (Xapian::Query::OP_WILDCARD, term_prefix)); } else { return Xapian::Query (term_prefix); } } if (str.at (0) == '/') { - if (str.length() > 1 && str.at (str.size () - 1) == '/'){ - std::string regexp_str = str.substr(1,str.size () - 2); + if (str.length () > 1 && str.at (str.size () - 1) == '/') { + std::string regexp_str = str.substr (1, str.size () - 2); if (slot != Xapian::BAD_VALUENO) { RegexpPostingSource *postings = new RegexpPostingSource (slot, regexp_str); return Xapian::Query (postings->release ()); @@ -176,14 +176,14 @@ RegexpFieldProcessor::operator() (const std::string & str) std::vector terms; regex_t regexp; - compile_regex(regexp, regexp_str.c_str ()); + compile_regex (regexp, regexp_str.c_str ()); for (Xapian::TermIterator it = notmuch->xapian_db->allterms_begin (term_prefix); it != notmuch->xapian_db->allterms_end (); ++it) { - if (regexec (®exp, (*it).c_str () + term_prefix.size(), + if (regexec (®exp, (*it).c_str () + term_prefix.size (), 0, NULL, 0) == 0) - terms.push_back(*it); + terms.push_back (*it); } - return Xapian::Query (Xapian::Query::OP_OR, terms.begin(), terms.end()); + return Xapian::Query (Xapian::Query::OP_OR, terms.begin (), terms.end ()); } } else { throw Xapian::QueryParserError ("unmatched regex delimiter in '" + str + "'"); @@ -207,4 +207,3 @@ RegexpFieldProcessor::operator() (const std::string & str) } } } -#endif