query->query_string = talloc_strdup (query, query_string);
- query->sort = NOTMUCH_SORT_DATE_OLDEST_FIRST;
+ query->sort = NOTMUCH_SORT_NEWEST_FIRST;
return query;
}
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)
+notmuch_query_search_messages (notmuch_query_t *query,
+ int first,
+ int max_messages)
{
notmuch_database_t *notmuch = query->notmuch;
const char *query_string = query->query_string;
- notmuch_messages_t *messages;
+ notmuch_message_list_t *message_list;
+ Xapian::MSetIterator i;
- messages = talloc (query, notmuch_messages_t);
- if (unlikely (messages == NULL))
+ message_list = _notmuch_message_list_create (query);
+ if (unlikely (message_list == NULL))
return NULL;
try {
Xapian::QueryParser::FLAG_PHRASE |
Xapian::QueryParser::FLAG_LOVEHATE |
Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE |
- Xapian::QueryParser::FLAG_WILDCARD);
+ Xapian::QueryParser::FLAG_WILDCARD |
+ Xapian::QueryParser::FLAG_PURE_NOT);
if (strcmp (query_string, "") == 0) {
final_query = mail_query;
}
switch (query->sort) {
- case NOTMUCH_SORT_DATE_OLDEST_FIRST:
+ case NOTMUCH_SORT_OLDEST_FIRST:
enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, FALSE);
break;
- case NOTMUCH_SORT_DATE_NEWEST_FIRST:
+ case NOTMUCH_SORT_NEWEST_FIRST:
enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, TRUE);
break;
case NOTMUCH_SORT_MESSAGE_ID:
enquire.set_query (final_query);
- mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ());
-
- messages->notmuch = notmuch;
-
- new (&messages->iterator) Xapian::MSetIterator ();
- new (&messages->iterator_end) Xapian::MSetIterator ();
-
- talloc_set_destructor (messages, _notmuch_messages_destructor);
-
- messages->iterator = mset.begin ();
- messages->iterator_end = mset.end ();
+ if (max_messages == -1)
+ max_messages = notmuch->xapian_db->get_doccount ();
+ mset = enquire.get_mset (first, max_messages);
+
+ for (i = mset.begin (); i != mset.end (); i++) {
+ notmuch_message_t *message;
+ notmuch_private_status_t status;
+
+ message = _notmuch_message_create (message_list, 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;
+ }
+
+ _notmuch_message_list_add_message (message_list, message);
+ }
} catch (const Xapian::Error &error) {
fprintf (stderr, "A Xapian exception occurred: %s\n",
error.get_msg().c_str());
}
- return messages;
+ return _notmuch_messages_create (message_list);
}
/* Glib objects force use to use a talloc destructor as well, (but not
}
notmuch_threads_t *
-notmuch_query_search_threads (notmuch_query_t *query)
+notmuch_query_search_threads (notmuch_query_t *query,
+ int first,
+ int max_threads)
{
notmuch_threads_t *threads;
notmuch_thread_t *thread;
notmuch_messages_t *messages;
notmuch_message_t *message;
GHashTable *seen;
+ int messages_seen = 0, threads_seen = 0;
threads = talloc (query, notmuch_threads_t);
if (threads == NULL)
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))
+ while (max_threads < 0 || threads_seen < first + max_threads)
{
- message = notmuch_messages_get (messages);
-
- thread_id = notmuch_message_get_thread_id (message);
+ int messages_seen_previously = messages_seen;
- if (! g_hash_table_lookup_extended (seen,
- thread_id, NULL,
- (void **) &thread))
+ for (messages = notmuch_query_search_messages (query,
+ messages_seen,
+ max_threads);
+ notmuch_messages_has_more (messages);
+ notmuch_messages_advance (messages))
{
- thread = _notmuch_thread_create (query, query->notmuch,
- thread_id);
+ message = notmuch_messages_get (messages);
- g_hash_table_insert (seen, xstrdup (thread_id), thread);
+ thread_id = notmuch_message_get_thread_id (message);
- g_ptr_array_add (threads->threads, thread);
- }
+ if (! g_hash_table_lookup_extended (seen,
+ thread_id, NULL,
+ (void **) &thread))
+ {
+ if (threads_seen >= first) {
+ thread = _notmuch_thread_create (query, query->notmuch,
+ thread_id,
+ query->query_string);
+ g_ptr_array_add (threads->threads, thread);
+ } else {
+ thread = NULL;
+ }
- _notmuch_thread_add_message (thread, message);
+ g_hash_table_insert (seen, xstrdup (thread_id), thread);
- notmuch_message_destroy (message);
- }
+ threads_seen++;
+ }
- g_hash_table_unref (seen);
+ notmuch_message_destroy (message);
- return threads;
-}
+ messages_seen++;
-void
-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 (max_threads >= 0 && threads_seen >= first + max_threads)
+ break;
+ }
- if (message == NULL &&
- status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND)
- {
- INTERNAL_ERROR ("a messages iterator contains a non-existent document ID.\n");
+ /* Stop if we're not seeing any more messages. */
+ if (messages_seen == messages_seen_previously)
+ break;
}
- return message;
-}
+ g_hash_table_unref (seen);
-void
-notmuch_messages_advance (notmuch_messages_t *messages)
-{
- messages->iterator++;
+ return threads;
}
void
-notmuch_messages_destroy (notmuch_messages_t *messages)
+notmuch_query_destroy (notmuch_query_t *query)
{
- talloc_free (messages);
+ talloc_free (query);
}
notmuch_bool_t