X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fregexp-fields.cc;h=0feb50e586ba84f1c4ef84cb62e78ea679b472c3;hp=084bc8c019999cefe7b7d0dff01d27463d6cc4a7;hb=5fbb2c7929196033b6787ab40f7d94ec89bfbbba;hpb=ab022657776af0bb47e72caf2517464ca59e7d48

diff --git a/lib/regexp-fields.cc b/lib/regexp-fields.cc
index 084bc8c0..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 &regexp, const char *str)
 {
@@ -35,9 +34,9 @@ compile_regex (regex_t &regexp, const char *str)
     if (err != 0) {
 	size_t len = regerror (err, &regexp, NULL, 0);
 	char *buffer = new char[len];
-	std::string msg;
+	std::string msg = "Regexp error: ";
 	(void) regerror (err, &regexp, buffer, len);
-	msg.assign (buffer, len);
+	msg.append (buffer, len);
 	delete[] buffer;
 
 	throw Xapian::QueryParserError (msg);
@@ -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 (&regexp_, (*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<std::string> 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 (&regexp, (*it).c_str () + term_prefix.size(),
+		    if (regexec (&regexp, (*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 + "'");
@@ -194,7 +194,7 @@ RegexpFieldProcessor::operator() (const std::string & str)
 	     * phrase parsing, when possible */
 	    std::string query_str;
 
-	    if (str.find (' ') != std::string::npos)
+	    if (*str.rbegin () != '*' || str.find (' ') != std::string::npos)
 		query_str = '"' + str + '"';
 	    else
 		query_str = str;
@@ -207,4 +207,3 @@ RegexpFieldProcessor::operator() (const std::string & str)
 	}
     }
 }
-#endif