#include "notmuch-private.h"
#include "database-private.h"
+#include <glib.h> /* GHashTable, GPtrArray */
+
#include <xapian.h>
struct _notmuch_query {
notmuch_sort_t sort;
};
-struct _notmuch_results {
+struct _notmuch_message_results {
notmuch_database_t *notmuch;
Xapian::MSetIterator iterator;
Xapian::MSetIterator iterator_end;
};
+struct _notmuch_thread_results {
+ notmuch_database_t *notmuch;
+ GPtrArray *thread_ids;
+ unsigned int index;
+};
+
notmuch_query_t *
notmuch_query_create (notmuch_database_t *notmuch,
const char *query_string)
* talloc_set_destructor at all otherwise).
*/
static int
-_notmuch_results_destructor (notmuch_results_t *results)
+_notmuch_message_results_destructor (notmuch_message_results_t *results)
{
results->iterator.~MSetIterator ();
results->iterator_end.~MSetIterator ();
return 0;
}
-notmuch_results_t *
-notmuch_query_search (notmuch_query_t *query)
+notmuch_message_results_t *
+notmuch_query_search_messages (notmuch_query_t *query)
{
notmuch_database_t *notmuch = query->notmuch;
const char *query_string = query->query_string;
- notmuch_results_t *results;
+ notmuch_message_results_t *results;
- results = talloc (query, notmuch_results_t);
+ results = talloc (query, notmuch_message_results_t);
if (unlikely (results == NULL))
return NULL;
switch (query->sort) {
case NOTMUCH_SORT_DATE_OLDEST_FIRST:
- enquire.set_sort_by_value (NOTMUCH_VALUE_DATE, FALSE);
+ enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, FALSE);
break;
case NOTMUCH_SORT_DATE_NEWEST_FIRST:
- enquire.set_sort_by_value (NOTMUCH_VALUE_DATE, TRUE);
+ 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);
new (&results->iterator) Xapian::MSetIterator ();
new (&results->iterator_end) Xapian::MSetIterator ();
- talloc_set_destructor (results, _notmuch_results_destructor);
+ talloc_set_destructor (results, _notmuch_message_results_destructor);
results->iterator = mset.begin ();
results->iterator_end = mset.end ();
return results;
}
+notmuch_thread_results_t *
+notmuch_query_search_threads (notmuch_query_t *query)
+{
+ notmuch_thread_results_t *thread_results;
+ notmuch_message_results_t *message_results;
+ notmuch_message_t *message;
+ const char *thread_id;
+ GHashTable *seen;
+
+ thread_results = talloc (query, notmuch_thread_results_t);
+ if (thread_results == NULL)
+ return NULL;
+
+ thread_results->notmuch = query->notmuch;
+ thread_results->thread_ids = g_ptr_array_new ();
+ thread_results->index = 0;
+
+ seen = g_hash_table_new_full (g_str_hash, g_str_equal,
+ free, NULL);
+
+ for (message_results = notmuch_query_search_messages (query);
+ notmuch_message_results_has_more (message_results);
+ notmuch_message_results_advance (message_results))
+ {
+ message = notmuch_message_results_get (message_results);
+ thread_id = notmuch_message_get_thread_id (message);
+
+ if (g_hash_table_lookup_extended (seen,
+ thread_id, NULL, NULL))
+ {
+ continue;
+ }
+
+ g_hash_table_insert (seen, xstrdup (thread_id), NULL);
+
+ g_ptr_array_add (thread_results->thread_ids,
+ talloc_strdup (thread_results, thread_id));
+ }
+
+ g_hash_table_unref (seen);
+
+ return thread_results;
+}
+
void
notmuch_query_destroy (notmuch_query_t *query)
{
}
notmuch_bool_t
-notmuch_results_has_more (notmuch_results_t *results)
+notmuch_message_results_has_more (notmuch_message_results_t *results)
{
return (results->iterator != results->iterator_end);
}
notmuch_message_t *
-notmuch_results_get (notmuch_results_t *results)
+notmuch_message_results_get (notmuch_message_results_t *results)
{
+ notmuch_message_t *message;
Xapian::docid doc_id;
+ notmuch_private_status_t status;
+
+ if (! notmuch_message_results_has_more (results))
+ return NULL;
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
-notmuch_results_advance (notmuch_results_t *results)
+notmuch_message_results_advance (notmuch_message_results_t *results)
{
results->iterator++;
}
void
-notmuch_results_destroy (notmuch_results_t *results)
+notmuch_message_results_destroy (notmuch_message_results_t *results)
+{
+ talloc_free (results);
+}
+
+notmuch_bool_t
+notmuch_thread_results_has_more (notmuch_thread_results_t *results)
+{
+ return (results->index < results->thread_ids->len);
+}
+
+notmuch_thread_t *
+notmuch_thread_results_get (notmuch_thread_results_t *results)
+{
+ notmuch_thread_t *thread;
+ const char *thread_id;
+
+ if (! notmuch_thread_results_has_more (results))
+ return NULL;
+
+ thread_id = (const char *) g_ptr_array_index (results->thread_ids,
+ results->index);
+
+ thread = _notmuch_thread_create (results,
+ results->notmuch,
+ thread_id);
+
+ return thread;
+}
+
+void
+notmuch_thread_results_advance (notmuch_thread_results_t *results)
+{
+ results->index++;
+}
+
+void
+notmuch_thread_results_destroy (notmuch_thread_results_t *results)
{
+ g_ptr_array_free (results->thread_ids, TRUE);
talloc_free (results);
}