notmuch dump: Fix the sorting of results.

[notmuch] / query.cc

diff --git a/query.cc b/query.cc
index d3614dc3ee8d012ab5a868b03b096bda001c82a5..a15de9664a5ac4b8d15f5e567f873364a39d2f9a 100644 (file)
--- 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 *
@@ -49,11 +47,7 @@ notmuch_query_create (notmuch_database_t *notmuch,
 
     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;
 
@@ -66,11 +60,17 @@ notmuch_query_set_sort (notmuch_query_t *query, notmuch_sort_t sort)
     query->sort = sort;
 }
 
+/* We end up having to call the destructors explicitly because we had
+ * to use "placement new" in order to initialize C++ objects within a
+ * block that we allocated with talloc. So C++ is making talloc
+ * slightly less simple to use, (we wouldn't need
+ * talloc_set_destructor at all otherwise).
+ */
 static int
-_notmuch_results_destroy (notmuch_results_t *results)
+_notmuch_results_destructor (notmuch_results_t *results)
 {
-    results->iterator.~PostingIterator ();
-    results->iterator_end.~PostingIterator ();
+    results->iterator.~MSetIterator ();
+    results->iterator_end.~MSetIterator ();
 
     return 0;
 }
@@ -78,6 +78,8 @@ _notmuch_results_destroy (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);
@@ -85,19 +87,50 @@ 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 ("Kmail");
+       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_DATE, FALSE);
+           break;
+       case NOTMUCH_SORT_DATE_NEWEST_FIRST:
+           enquire.set_sort_by_value (NOTMUCH_VALUE_DATE, 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 ();
+       enquire.set_query (final_query);
+
+       mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ());
+
+       results->notmuch = notmuch;
 
-       talloc_set_destructor (results, _notmuch_results_destroy);
+       new (&results->iterator) Xapian::MSetIterator ();
+       new (&results->iterator_end) Xapian::MSetIterator ();
 
-       results->iterator = query->notmuch->xapian_db->postlist_begin ("");
-       results->iterator_end = query->notmuch->xapian_db->postlist_end ("");
+       talloc_set_destructor (results, _notmuch_results_destructor);
+
+       results->iterator = mset.begin ();
+       results->iterator_end = mset.end ();
 
     } catch (const Xapian::Error &error) {
        fprintf (stderr, "A Xapian exception occurred: %s\n",
@@ -135,3 +168,9 @@ notmuch_results_advance (notmuch_results_t *results)
 {
     results->iterator++;
 }
+
+void
+notmuch_results_destroy (notmuch_results_t *results)
+{
+    talloc_free (results);
+}