#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_messages {
notmuch_database_t *notmuch;
Xapian::MSetIterator iterator;
Xapian::MSetIterator iterator_end;
};
+struct _notmuch_threads {
+ notmuch_database_t *notmuch;
+ GPtrArray *threads;
+ 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_messages_destructor (notmuch_messages_t *messages)
{
- results->iterator.~MSetIterator ();
- results->iterator_end.~MSetIterator ();
+ messages->iterator.~MSetIterator ();
+ messages->iterator_end.~MSetIterator ();
return 0;
}
-notmuch_results_t *
-notmuch_query_search (notmuch_query_t *query)
+notmuch_messages_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_messages_t *messages;
- results = talloc (query, notmuch_results_t);
- if (unlikely (results == NULL))
+ messages = talloc (query, notmuch_messages_t);
+ if (unlikely (messages == NULL))
return NULL;
try {
Xapian::Enquire enquire (*notmuch->xapian_db);
- Xapian::Query mail_query ("Kmail");
+ 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 &
+ 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) {
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);
mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ());
- results->notmuch = notmuch;
+ messages->notmuch = notmuch;
- new (&results->iterator) Xapian::MSetIterator ();
- new (&results->iterator_end) Xapian::MSetIterator ();
+ new (&messages->iterator) Xapian::MSetIterator ();
+ new (&messages->iterator_end) Xapian::MSetIterator ();
- talloc_set_destructor (results, _notmuch_results_destructor);
+ talloc_set_destructor (messages, _notmuch_messages_destructor);
- results->iterator = mset.begin ();
- results->iterator_end = mset.end ();
+ messages->iterator = mset.begin ();
+ messages->iterator_end = mset.end ();
} catch (const Xapian::Error &error) {
fprintf (stderr, "A Xapian exception occurred: %s\n",
error.get_msg().c_str());
}
- return results;
+ return messages;
+}
+
+/* Glib objects force use to use a talloc destructor as well, (but not
+ * nearly as ugly as the for messages due to C++ objects). At
+ * this point, I'd really like to have some talloc-friendly
+ * equivalents for the few pieces of glib that I'm using. */
+static int
+_notmuch_threads_destructor (notmuch_threads_t *threads)
+{
+ g_ptr_array_free (threads->threads, TRUE);
+
+ return 0;
+}
+
+notmuch_threads_t *
+notmuch_query_search_threads (notmuch_query_t *query)
+{
+ notmuch_threads_t *threads;
+ notmuch_thread_t *thread;
+ const char *thread_id;
+ notmuch_messages_t *messages;
+ notmuch_message_t *message;
+ GHashTable *seen;
+
+ threads = talloc (query, notmuch_threads_t);
+ if (threads == NULL)
+ return NULL;
+
+ threads->notmuch = query->notmuch;
+ threads->threads = g_ptr_array_new ();
+ threads->index = 0;
+
+ talloc_set_destructor (threads, _notmuch_threads_destructor);
+
+ seen = g_hash_table_new_full (g_str_hash, g_str_equal,
+ free, NULL);
+
+ for (messages = notmuch_query_search_messages (query);
+ notmuch_messages_has_more (messages);
+ notmuch_messages_advance (messages))
+ {
+ message = notmuch_messages_get (messages);
+
+ thread_id = notmuch_message_get_thread_id (message);
+
+ if (! g_hash_table_lookup_extended (seen,
+ thread_id, NULL,
+ (void **) &thread))
+ {
+ thread = _notmuch_thread_create (query, query->notmuch,
+ thread_id);
+
+ g_hash_table_insert (seen, xstrdup (thread_id), thread);
+
+ g_ptr_array_add (threads->threads, thread);
+ }
+
+ _notmuch_thread_add_message (thread, message);
+
+ notmuch_message_destroy (message);
+ }
+
+ g_hash_table_unref (seen);
+
+ return threads;
}
void
}
notmuch_bool_t
-notmuch_results_has_more (notmuch_results_t *results)
+notmuch_messages_has_more (notmuch_messages_t *messages)
{
- return (results->iterator != results->iterator_end);
+ return (messages->iterator != messages->iterator_end);
}
notmuch_message_t *
-notmuch_results_get (notmuch_results_t *results)
+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);
- doc_id = *results->iterator;
+ 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)
+{
+ return (threads->index < threads->threads->len);
+}
+
+notmuch_thread_t *
+notmuch_threads_get (notmuch_threads_t *threads)
+{
+ if (! notmuch_threads_has_more (threads))
+ return NULL;
- return _notmuch_message_create (results,
- results->notmuch, doc_id);
+ return (notmuch_thread_t *) g_ptr_array_index (threads->threads,
+ threads->index);
}
void
-notmuch_results_advance (notmuch_results_t *results)
+notmuch_threads_advance (notmuch_threads_t *threads)
{
- results->iterator++;
+ threads->index++;
}
void
-notmuch_results_destroy (notmuch_results_t *results)
+notmuch_threads_destroy (notmuch_threads_t *threads)
{
- talloc_free (results);
+ talloc_free (threads);
}
projects / notmuch / blobdiff