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,
int first,
{
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:
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 (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;
+ }
- messages->iterator = mset.begin ();
- messages->iterator_end = mset.end ();
+ _notmuch_message_list_add_message (message_list, message);
+ }
} catch (const Xapian::Error &error) {
- fprintf (stderr, "A Xapian exception occurred: %s\n",
+ fprintf (stderr, "A Xapian exception occurred performing query: %s\n",
error.get_msg().c_str());
+ fprintf (stderr, "Query string was: %s\n", query->query_string);
+ notmuch->exception_reported = TRUE;
}
- return messages;
+ return _notmuch_messages_create (message_list);
}
/* Glib objects force use to use a talloc destructor as well, (but not
{
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;
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)
{
{
talloc_free (threads);
}
+
+unsigned
+notmuch_query_count_messages (notmuch_query_t *query)
+{
+ notmuch_database_t *notmuch = query->notmuch;
+ const char *query_string = query->query_string;
+ Xapian::doccount count;
+
+ try {
+ Xapian::Enquire enquire (*notmuch->xapian_db);
+ 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 |
+ Xapian::QueryParser::FLAG_WILDCARD |
+ Xapian::QueryParser::FLAG_PURE_NOT);
+
+ 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);
+ }
+
+ enquire.set_weighting_scheme(Xapian::BoolWeight());
+ enquire.set_docid_order(Xapian::Enquire::ASCENDING);
+
+#if DEBUG_QUERY
+ fprintf (stderr, "Final query is:\n%s\n", final_query.get_description().c_str());
+#endif
+
+ enquire.set_query (final_query);
+
+ mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ());
+
+ count = mset.get_matches_estimated();
+
+ } catch (const Xapian::Error &error) {
+ fprintf (stderr, "A Xapian exception occurred: %s\n",
+ error.get_msg().c_str());
+ fprintf (stderr, "Query string was: %s\n", query->query_string);
+ }
+
+ return count;
+}
projects / notmuch / blobdiff