ruby: use new count API

[notmuch] / bindings / ruby / query.c

diff --git a/bindings/ruby/query.c b/bindings/ruby/query.c
index 2a800080bdd8a375c2cdda8caea8ad9adf5ccede..f87700a49a5da5fe68e2252db060c82fc1500797 100644 (file)
--- a/bindings/ruby/query.c
+++ b/bindings/ruby/query.c
@@ -106,6 +106,24 @@ notmuch_rb_query_add_tag_exclude (VALUE self, VALUE tagv)
     return Qnil;
 }
 
+/*
+ * call-seq: QUERY.omit_excluded=(boolean) => nil
+ *
+ * Specify whether to omit excluded results or simply flag them.
+ * By default, this is set to +true+.
+ */
+VALUE
+notmuch_rb_query_set_omit_excluded (VALUE self, VALUE omitv)
+{
+    notmuch_query_t *query;
+
+    Data_Get_Notmuch_Query (self, query);
+
+    notmuch_query_set_omit_excluded (query, RTEST (omitv));
+
+    return Qnil;
+}
+
 /*
  * call-seq: QUERY.search_threads => THREADS
  *
@@ -155,12 +173,35 @@ VALUE
 notmuch_rb_query_count_messages (VALUE self)
 {
     notmuch_query_t *query;
+    notmuch_status_t status;
+    unsigned int count;
 
     Data_Get_Notmuch_Query (self, query);
 
-    /* Xapian exceptions are not handled properly.
-     * (function may return 0 after printing a message)
-     * Thus there is nothing we can do here...
-     */
-    return UINT2FIX(notmuch_query_count_messages(query));
+    status = notmuch_query_count_messages_st (query, &count);
+    if (status)
+       notmuch_rb_status_raise (status);
+
+    return UINT2NUM(count);
+}
+
+/*
+ * call-seq: QUERY.count_threads => Fixnum
+ *
+ * Return an estimate of the number of threads matching a search
+ */
+VALUE
+notmuch_rb_query_count_threads (VALUE self)
+{
+    notmuch_query_t *query;
+    notmuch_status_t status;
+    unsigned int count;
+
+    Data_Get_Notmuch_Query (self, query);
+
+    status = notmuch_query_count_threads_st (query, &count);
+    if (status)
+       notmuch_rb_status_raise (status);
+
+    return UINT2NUM(count);
 }