X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lib%2Fquery.cc;h=7d191e529ec72974a2ec5adad21fe63e87e2942f;hb=94eb9aacd40a8aa133f64bbe5ed71c0138fb5ed9;hp=a70be1ddc4701dc28c7d24684180aad01394c5e5;hpb=f970d8078cc29f876bebe02937307a5a8f2d394f;p=notmuch

diff --git a/lib/query.cc b/lib/query.cc
index a70be1dd..7d191e52 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -38,9 +38,12 @@ struct _notmuch_messages {
 };
 
 struct _notmuch_threads {
-    notmuch_database_t *notmuch;
-    GPtrArray *threads;
-    unsigned int index;
+    notmuch_query_t *query;
+    GHashTable *threads;
+    notmuch_messages_t *messages;
+
+    /* This thread ID is our iterator state. */
+    const char *thread_id;
 };
 
 notmuch_query_t *
@@ -61,7 +64,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;
 }
@@ -73,9 +76,7 @@ notmuch_query_set_sort (notmuch_query_t *query, notmuch_sort_t sort)
 }
 
 notmuch_messages_t *
-notmuch_query_search_messages (notmuch_query_t *query,
-			       int first,
-			       int max_messages)
+notmuch_query_search_messages (notmuch_query_t *query)
 {
     notmuch_database_t *notmuch = query->notmuch;
     const char *query_string = query->query_string;
@@ -97,7 +98,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 +111,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:
@@ -126,9 +128,7 @@ notmuch_query_search_messages (notmuch_query_t *query,
 
 	enquire.set_query (final_query);
 
-	if (max_messages == -1)
-	    max_messages = notmuch->xapian_db->get_doccount ();
-	mset = enquire.get_mset (first, max_messages);
+	mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ());
 
 	for (i = mset.begin (); i != mset.end (); i++) {
 	    notmuch_message_t *message;
@@ -148,8 +148,10 @@ notmuch_query_search_messages (notmuch_query_t *query,
 	}
 
     } 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 _notmuch_messages_create (message_list);
@@ -162,83 +164,29 @@ notmuch_query_search_messages (notmuch_query_t *query,
 static int
 _notmuch_threads_destructor (notmuch_threads_t *threads)
 {
-    g_ptr_array_free (threads->threads, TRUE);
+    g_hash_table_unref (threads->threads);
 
     return 0;
 }
 
 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;
-    const char *thread_id;
-    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)
 	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);
-
-    while (max_threads < 0 || threads_seen < first + max_threads)
-    {
-	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);
-
-	    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++;
-	    }
-
-	    notmuch_message_destroy (message);
+    threads->query = query;
+    threads->threads = g_hash_table_new_full (g_str_hash, g_str_equal,
+					      free, NULL);
 
-	    messages_seen++;
+    threads->messages = notmuch_query_search_messages (query);
 
-	    if (max_threads >= 0 && threads_seen >= first + max_threads)
-		break;
-	}
-
-	/* Stop if we're not seeing any more messages. */
-	if (messages_seen == messages_seen_previously)
-	    break;
-    }
+    threads->thread_id = NULL;
 
-    g_hash_table_unref (seen);
+    talloc_set_destructor (threads, _notmuch_threads_destructor);
 
     return threads;
 }
@@ -252,7 +200,32 @@ notmuch_query_destroy (notmuch_query_t *query)
 notmuch_bool_t
 notmuch_threads_has_more (notmuch_threads_t *threads)
 {
-    return (threads->index < threads->threads->len);
+    notmuch_message_t *message;
+
+    if (threads->thread_id)
+	return TRUE;
+
+    while (notmuch_messages_has_more (threads->messages))
+    {
+	message = notmuch_messages_get (threads->messages);
+
+	threads->thread_id = notmuch_message_get_thread_id (message);
+
+	if (! g_hash_table_lookup_extended (threads->threads,
+					    threads->thread_id,
+					    NULL, NULL))
+	{
+	    g_hash_table_insert (threads->threads,
+				 xstrdup (threads->thread_id), NULL);
+	    notmuch_messages_advance (threads->messages);
+	    return TRUE;
+	}
+
+	notmuch_messages_advance (threads->messages);
+    }
+
+    threads->thread_id = NULL;
+    return FALSE;
 }
 
 notmuch_thread_t *
@@ -261,14 +234,16 @@ notmuch_threads_get (notmuch_threads_t *threads)
     if (! notmuch_threads_has_more (threads))
 	return NULL;
 
-    return (notmuch_thread_t *) g_ptr_array_index (threads->threads,
-						   threads->index);
+    return _notmuch_thread_create (threads->query,
+				   threads->query->notmuch,
+				   threads->thread_id,
+				   threads->query->query_string);
 }
 
 void
 notmuch_threads_advance (notmuch_threads_t *threads)
 {
-    threads->index++;
+    threads->thread_id = NULL;
 }
 
 void
@@ -276,3 +251,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;
+}