lib: Move notmuch_messages_t code from query.cc to new messages.c

[notmuch] / lib / query.cc

diff --git a/lib/query.cc b/lib/query.cc
index b5f1546ac084d609b24a25a60dd68e677f513145..d499a219aefddec48bff8ea58f9c57bebd3b0740 100644 (file)
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -61,7 +61,7 @@ notmuch_query_create (notmuch_database_t *notmuch,
 
     query->query_string = talloc_strdup (query, query_string);
 
-    query->sort = NOTMUCH_SORT_DATE_OLDEST_FIRST;
+    query->sort = NOTMUCH_SORT_DATE;
 
     return query;
 }
@@ -72,21 +72,6 @@ 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_messages_destructor (notmuch_messages_t *messages)
-{
-    messages->iterator.~MSetIterator ();
-    messages->iterator_end.~MSetIterator ();
-
-    return 0;
-}
-
 notmuch_messages_t *
 notmuch_query_search_messages (notmuch_query_t *query,
                               int first,
@@ -95,8 +80,9 @@ notmuch_query_search_messages (notmuch_query_t *query,
     notmuch_database_t *notmuch = query->notmuch;
     const char *query_string = query->query_string;
     notmuch_messages_t *messages;
+    Xapian::MSetIterator i;
 
-    messages = talloc (query, notmuch_messages_t);
+    messages = _notmuch_messages_create (query);
     if (unlikely (messages == NULL))
        return NULL;
 
@@ -123,10 +109,10 @@ notmuch_query_search_messages (notmuch_query_t *query,
        }
 
        switch (query->sort) {
-       case NOTMUCH_SORT_DATE_OLDEST_FIRST:
+       case NOTMUCH_SORT_DATE:
            enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, FALSE);
            break;
-       case NOTMUCH_SORT_DATE_NEWEST_FIRST:
+       case NOTMUCH_SORT_DATE_REVERSE:
            enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, TRUE);
            break;
        case NOTMUCH_SORT_MESSAGE_ID:
@@ -144,15 +130,22 @@ notmuch_query_search_messages (notmuch_query_t *query,
            max_messages = notmuch->xapian_db->get_doccount ();
        mset = enquire.get_mset (first, max_messages);
 
-       messages->notmuch = notmuch;
+       for (i = mset.begin (); i != mset.end (); i++) {
+           notmuch_message_t *message;
+           notmuch_private_status_t status;
 
-       new (&messages->iterator) Xapian::MSetIterator ();
-       new (&messages->iterator_end) Xapian::MSetIterator ();
-
-       talloc_set_destructor (messages, _notmuch_messages_destructor);
+           message = _notmuch_message_create (messages, notmuch,
+                                              *i, &status);
+           if (message == NULL)
+           {
+               if (status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND)
+                   INTERNAL_ERROR ("A message iterator contains a "
+                                   "non-existent document ID.\n");
+               break;
+           }
 
-       messages->iterator = mset.begin ();
-       messages->iterator_end = mset.end ();
+           _notmuch_messages_add_message (messages, message);
+       }
 
     } catch (const Xapian::Error &error) {
        fprintf (stderr, "A Xapian exception occurred: %s\n",
@@ -220,7 +213,8 @@ notmuch_query_search_threads (notmuch_query_t *query,
            {
                if (threads_seen >= first) {
                    thread = _notmuch_thread_create (query, query->notmuch,
-                                                    thread_id);
+                                                    thread_id,
+                                                    query->query_string);
                    g_ptr_array_add (threads->threads, thread);
                } else {
                    thread = NULL;
@@ -255,49 +249,6 @@ notmuch_query_destroy (notmuch_query_t *query)
     talloc_free (query);
 }
 
-notmuch_bool_t
-notmuch_messages_has_more (notmuch_messages_t *messages)
-{
-    return (messages->iterator != messages->iterator_end);
-}
-
-notmuch_message_t *
-notmuch_messages_get (notmuch_messages_t *messages)
-{
-    notmuch_message_t *message;
-    Xapian::docid doc_id;
-    notmuch_private_status_t status;
-
-    if (! notmuch_messages_has_more (messages))
-       return NULL;
-
-    doc_id = *messages->iterator;
-
-    message = _notmuch_message_create (messages,
-                                      messages->notmuch, doc_id,
-                                      &status);
-
-    if (message == NULL &&
-       status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND)
-    {
-       INTERNAL_ERROR ("a messages iterator contains a non-existent document ID.\n");
-    }
-
-    return message;
-}
-
-void
-notmuch_messages_advance (notmuch_messages_t *messages)
-{
-    messages->iterator++;
-}
-
-void
-notmuch_messages_destroy (notmuch_messages_t *messages)
-{
-    talloc_free (messages);
-}
-
 notmuch_bool_t
 notmuch_threads_has_more (notmuch_threads_t *threads)
 {