X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=query.cc;h=88d76ef19ff6c2b825d81bbb256e218607c6f839;hp=c669fb9110a6fed7347ae454ddafa12fac3edbaa;hb=a360670c03475b1489ea5e2327cc3037cc8dff0b;hpb=f6c7810945f1bc25b15dee72257c3b68bd0e8a40

diff --git a/query.cc b/query.cc
index c669fb91..88d76ef1 100644
--- a/query.cc
+++ b/query.cc
@@ -23,8 +23,6 @@
 
 #include <xapian.h>
 
-const char *NOTMUCH_QUERY_ALL = "";
-
 struct _notmuch_query {
     notmuch_database_t *notmuch;
     const char *query_string;
@@ -33,8 +31,8 @@ struct _notmuch_query {
 
 struct _notmuch_results {
     notmuch_database_t *notmuch;
-    Xapian::PostingIterator iterator;
-    Xapian::PostingIterator iterator_end;
+    Xapian::MSetIterator iterator;
+    Xapian::MSetIterator iterator_end;
 };
 
 notmuch_query_t *
@@ -43,17 +41,17 @@ notmuch_query_create (notmuch_database_t *notmuch,
 {
     notmuch_query_t *query;
 
+#ifdef DEBUG_QUERY
+    fprintf (stderr, "Query string is:\n%s\n", query_string);
+#endif
+
     query = talloc (NULL, notmuch_query_t);
     if (unlikely (query == NULL))
 	return NULL;
 
     query->notmuch = notmuch;
 
-    /* Special-case NOTMUCH_QUERY_ALL so we see it and not a copy. */
-    if (query_string == NOTMUCH_QUERY_ALL)
-	query->query_string = query_string;
-    else
-	query->query_string = talloc_strdup (query, query_string);
+    query->query_string = talloc_strdup (query, query_string);
 
     query->sort = NOTMUCH_SORT_DATE_OLDEST_FIRST;
 
@@ -75,8 +73,8 @@ notmuch_query_set_sort (notmuch_query_t *query, notmuch_sort_t sort)
 static int
 _notmuch_results_destructor (notmuch_results_t *results)
 {
-    results->iterator.~PostingIterator ();
-    results->iterator_end.~PostingIterator ();
+    results->iterator.~MSetIterator ();
+    results->iterator_end.~MSetIterator ();
 
     return 0;
 }
@@ -84,6 +82,8 @@ _notmuch_results_destructor (notmuch_results_t *results)
 notmuch_results_t *
 notmuch_query_search (notmuch_query_t *query)
 {
+    notmuch_database_t *notmuch = query->notmuch;
+    const char *query_string = query->query_string;
     notmuch_results_t *results;
 
     results = talloc (query, notmuch_results_t);
@@ -91,19 +91,56 @@ notmuch_query_search (notmuch_query_t *query)
 	return NULL;
 
     try {
-	if (query->query_string != NOTMUCH_QUERY_ALL) {
-	    fprintf (stderr, "Error: Arbitrary search strings are not supported yet. Come back soon!\n");
-	    exit (1);
+	Xapian::Enquire enquire (*notmuch->xapian_db);
+	Xapian::Query mail_query (talloc_asprintf (query, "%s%s",
+						   _find_prefix ("type"),
+						   "mail"));
+	Xapian::Query string_query, final_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);
+
+	if (strcmp (query_string, "") == 0) {
+	    final_query = mail_query;
+	} else {
+	    string_query = notmuch->query_parser->
+		parse_query (query_string, flags);
+	    final_query = Xapian::Query (Xapian::Query::OP_AND,
+					 mail_query, string_query);
+	}
+
+	switch (query->sort) {
+	case NOTMUCH_SORT_DATE_OLDEST_FIRST:
+	    enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, FALSE);
+	    break;
+	case NOTMUCH_SORT_DATE_NEWEST_FIRST:
+	    enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, TRUE);
+	    break;
+	case NOTMUCH_SORT_MESSAGE_ID:
+	    enquire.set_sort_by_value (NOTMUCH_VALUE_MESSAGE_ID, FALSE);
+	    break;
 	}
 
-	results->notmuch = query->notmuch;
-	new (&results->iterator) Xapian::PostingIterator ();
-	new (&results->iterator_end) Xapian::PostingIterator ();
+#if DEBUG_QUERY
+	fprintf (stderr, "Final query is:\n%s\n", final_query.get_description().c_str());
+#endif
+
+	enquire.set_query (final_query);
+
+	mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ());
+
+	results->notmuch = notmuch;
+
+	new (&results->iterator) Xapian::MSetIterator ();
+	new (&results->iterator_end) Xapian::MSetIterator ();
 
 	talloc_set_destructor (results, _notmuch_results_destructor);
 
-	results->iterator = query->notmuch->xapian_db->postlist_begin ("");
-	results->iterator_end = query->notmuch->xapian_db->postlist_end ("");
+	results->iterator = mset.begin ();
+	results->iterator_end = mset.end ();
 
     } catch (const Xapian::Error &error) {
 	fprintf (stderr, "A Xapian exception occurred: %s\n",
@@ -128,12 +165,23 @@ notmuch_results_has_more (notmuch_results_t *results)
 notmuch_message_t *
 notmuch_results_get (notmuch_results_t *results)
 {
+    notmuch_message_t *message;
     Xapian::docid doc_id;
+    notmuch_private_status_t status;
 
     doc_id = *results->iterator;
 
-    return _notmuch_message_create (results,
-				    results->notmuch, doc_id);
+    message = _notmuch_message_create (results,
+				       results->notmuch, doc_id,
+				       &status);
+
+    if (message == NULL &&
+	status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND)
+    {
+	INTERNAL_ERROR ("a results iterator contains a non-existent document ID.\n");
+    }
+
+    return message;
 }
 
 void
@@ -141,3 +189,9 @@ notmuch_results_advance (notmuch_results_t *results)
 {
     results->iterator++;
 }
+
+void
+notmuch_results_destroy (notmuch_results_t *results)
+{
+    talloc_free (results);
+}