notmuch_sort_t sort;
};
-struct _notmuch_results {
+struct _notmuch_message_results {
notmuch_database_t *notmuch;
- Xapian::PostingIterator iterator;
- Xapian::PostingIterator iterator_end;
+ Xapian::MSetIterator iterator;
+ Xapian::MSetIterator iterator_end;
};
notmuch_query_t *
{
notmuch_query_t *query;
+#ifdef DEBUG_QUERY
+ fprintf (stderr, "Query string is:\n%s\n", query_string);
+#endif
+
query = talloc (NULL, notmuch_query_t);
if (unlikely (query == NULL))
return NULL;
* 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.~PostingIterator ();
- results->iterator_end.~PostingIterator ();
+ 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_results_t *results;
+ notmuch_database_t *notmuch = query->notmuch;
+ const char *query_string = query->query_string;
+ notmuch_message_results_t *results;
- results = talloc (query, notmuch_results_t);
+ results = talloc (query, notmuch_message_results_t);
if (unlikely (results == NULL))
return NULL;
try {
- if (strlen (query->query_string)) {
- fprintf (stderr, "Error: Arbitrary search strings are not supported yet. Come back soon!\n");
- exit (1);
+ 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);
+
+ 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);
+ }
+
+ switch (query->sort) {
+ case NOTMUCH_SORT_DATE_OLDEST_FIRST:
+ enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, FALSE);
+ break;
+ case NOTMUCH_SORT_DATE_NEWEST_FIRST:
+ 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);
+ break;
}
- results->notmuch = query->notmuch;
- new (&results->iterator) Xapian::PostingIterator ();
- new (&results->iterator_end) Xapian::PostingIterator ();
+#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 ());
- talloc_set_destructor (results, _notmuch_results_destructor);
+ results->notmuch = notmuch;
- results->iterator = query->notmuch->xapian_db->postlist_begin ("");
- results->iterator_end = query->notmuch->xapian_db->postlist_end ("");
+ new (&results->iterator) Xapian::MSetIterator ();
+ new (&results->iterator_end) Xapian::MSetIterator ();
+
+ talloc_set_destructor (results, _notmuch_message_results_destructor);
+
+ results->iterator = mset.begin ();
+ results->iterator_end = mset.end ();
} catch (const Xapian::Error &error) {
fprintf (stderr, "A Xapian exception occurred: %s\n",
}
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;
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);
}