X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fquery.cc;h=13bdd0a1b34b3ba944a39e22752986fef8304dea;hp=d499a219aefddec48bff8ea58f9c57bebd3b0740;hb=1fd8b7866f189a66e4491b01452f476371759f91;hpb=d3349358c6a5048559bd2a4faebe476ebd222170

diff --git a/lib/query.cc b/lib/query.cc
index d499a219..13bdd0a1 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -61,7 +61,7 @@ notmuch_query_create (notmuch_database_t *notmuch,
 
     query->query_string = talloc_strdup (query, query_string);
 
-    query->sort = NOTMUCH_SORT_DATE;
+    query->sort = NOTMUCH_SORT_NEWEST_FIRST;
 
     return query;
 }
@@ -79,11 +79,11 @@ notmuch_query_search_messages (notmuch_query_t *query,
 {
     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 = _notmuch_messages_create (query);
-    if (unlikely (messages == NULL))
+    message_list = _notmuch_message_list_create (query);
+    if (unlikely (message_list == NULL))
 	return NULL;
 
     try {
@@ -97,7 +97,8 @@ notmuch_query_search_messages (notmuch_query_t *query,
 			      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;
@@ -109,10 +110,10 @@ notmuch_query_search_messages (notmuch_query_t *query,
 	}
 
 	switch (query->sort) {
-	case NOTMUCH_SORT_DATE:
+	case NOTMUCH_SORT_OLDEST_FIRST:
 	    enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, FALSE);
 	    break;
-	case NOTMUCH_SORT_DATE_REVERSE:
+	case NOTMUCH_SORT_NEWEST_FIRST:
 	    enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, TRUE);
 	    break;
 	case NOTMUCH_SORT_MESSAGE_ID:
@@ -134,7 +135,7 @@ notmuch_query_search_messages (notmuch_query_t *query,
 	    notmuch_message_t *message;
 	    notmuch_private_status_t status;
 
-	    message = _notmuch_message_create (messages, notmuch,
+	    message = _notmuch_message_create (message_list, notmuch,
 					       *i, &status);
 	    if (message == NULL)
 	    {
@@ -144,15 +145,17 @@ notmuch_query_search_messages (notmuch_query_t *query,
 		break;
 	    }
 
-	    _notmuch_messages_add_message (messages, message);
+	    _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
@@ -168,9 +171,7 @@ _notmuch_threads_destructor (notmuch_threads_t *threads)
 }
 
 notmuch_threads_t *
-notmuch_query_search_threads (notmuch_query_t *query,
-			      int first,
-			      int max_threads)
+notmuch_query_search_threads (notmuch_query_t *query)
 {
     notmuch_threads_t *threads;
     notmuch_thread_t *thread;
@@ -178,7 +179,6 @@ notmuch_query_search_threads (notmuch_query_t *query,
     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)
@@ -193,49 +193,27 @@ notmuch_query_search_threads (notmuch_query_t *query,
     seen = g_hash_table_new_full (g_str_hash, g_str_equal,
 				  free, NULL);
 
-    while (max_threads < 0 || threads_seen < first + max_threads)
+    for (messages = notmuch_query_search_messages (query, 0, -1);
+	 notmuch_messages_has_more (messages);
+	 notmuch_messages_advance (messages))
     {
-	int messages_seen_previously = messages_seen;
-
-	for (messages = notmuch_query_search_messages (query,
-						       messages_seen,
-						       max_threads);
-	     notmuch_messages_has_more (messages);
-	     notmuch_messages_advance (messages))
-	{
-	    message = notmuch_messages_get (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))
-	    {
-		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;
-		}
-
-		g_hash_table_insert (seen, xstrdup (thread_id), thread);
-
-		threads_seen++;
-	    }
+	thread_id = notmuch_message_get_thread_id (message);
 
-	    notmuch_message_destroy (message);
-
-	    messages_seen++;
+	if (! g_hash_table_lookup_extended (seen,
+					    thread_id, NULL,
+					    (void **) &thread))
+	{
+	    thread = _notmuch_thread_create (query, query->notmuch,
+					     thread_id,
+					     query->query_string);
+	    g_ptr_array_add (threads->threads, thread);
 
-	    if (max_threads >= 0 && threads_seen >= first + max_threads)
-		break;
+	    g_hash_table_insert (seen, xstrdup (thread_id), thread);
 	}
 
-	/* Stop if we're not seeing any more messages. */
-	if (messages_seen == messages_seen_previously)
-	    break;
+	notmuch_message_destroy (message);
     }
 
     g_hash_table_unref (seen);
@@ -276,3 +254,55 @@ notmuch_threads_destroy (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;
+}