X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=bindings%2Fruby%2Fquery.c;h=2a800080bdd8a375c2cdda8caea8ad9adf5ccede;hp=50edf170893df3cb6795778d9e906f1cc3b007cf;hb=92680f12ebd276952ae51ff271526f4dd995a18a;hpb=06bf04500ba282052d38adf428219968ae62bb54

diff --git a/bindings/ruby/query.c b/bindings/ruby/query.c
index 50edf170..2a800080 100644
--- a/bindings/ruby/query.c
+++ b/bindings/ruby/query.c
@@ -1,6 +1,6 @@
 /* The Ruby interface to the notmuch mail library
  *
- * Copyright © 2010 Ali Polatel
+ * Copyright © 2010, 2011, 2012 Ali Polatel
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,22 +20,89 @@
 
 #include "defs.h"
 
+/*
+ * call-seq: QUERY.destroy! => nil
+ *
+ * Destroys the query, freeing all resources allocated for it.
+ */
+VALUE
+notmuch_rb_query_destroy (VALUE self)
+{
+    notmuch_query_t *query;
+
+    Data_Get_Notmuch_Query (self, query);
+
+    notmuch_query_destroy (query);
+    DATA_PTR (self) = NULL;
+
+    return Qnil;
+}
+
+/*
+ * call-seq: QUERY.sort => fixnum
+ *
+ * Get sort type of the +QUERY+
+ */
+VALUE
+notmuch_rb_query_get_sort (VALUE self)
+{
+    notmuch_query_t *query;
+
+    Data_Get_Notmuch_Query (self, query);
+
+    return FIX2INT (notmuch_query_get_sort (query));
+}
+
 /*
  * call-seq: QUERY.sort=(fixnum) => nil
  *
  * Set sort type of the +QUERY+
  */
 VALUE
-notmuch_rb_query_set_sort(VALUE self, VALUE sortv)
+notmuch_rb_query_set_sort (VALUE self, VALUE sortv)
 {
-    notmuch_rb_query_t *query;
+    notmuch_query_t *query;
+
+    Data_Get_Notmuch_Query (self, query);
 
-    Data_Get_Struct(self, notmuch_rb_query_t, query);
+    if (!FIXNUM_P (sortv))
+	rb_raise (rb_eTypeError, "Not a Fixnum");
 
-    if (!FIXNUM_P(sortv))
-        rb_raise(rb_eTypeError, "Not a fixnum");
+    notmuch_query_set_sort (query, FIX2UINT (sortv));
 
-    notmuch_query_set_sort(query->nm_query, FIX2UINT(sortv));
+    return Qnil;
+}
+
+/*
+ * call-seq: QUERY.to_s => string
+ *
+ * Get query string of the +QUERY+
+ */
+VALUE
+notmuch_rb_query_get_string (VALUE self)
+{
+    notmuch_query_t *query;
+
+    Data_Get_Notmuch_Query (self, query);
+
+    return rb_str_new2 (notmuch_query_get_query_string (query));
+}
+
+/*
+ * call-seq: QUERY.add_tag_exclude(tag) => nil
+ *
+ * Add a tag that will be excluded from the query results by default.
+ */
+VALUE
+notmuch_rb_query_add_tag_exclude (VALUE self, VALUE tagv)
+{
+    notmuch_query_t *query;
+    const char *tag;
+
+    Data_Get_Notmuch_Query (self, query);
+    tag = RSTRING_PTR(tagv);
+
+    notmuch_query_add_tag_exclude(query, tag);
     return Qnil;
 }
 
@@ -45,22 +112,18 @@ notmuch_rb_query_set_sort(VALUE self, VALUE sortv)
  * Search for threads
  */
 VALUE
-notmuch_rb_query_search_threads(VALUE self)
+notmuch_rb_query_search_threads (VALUE self)
 {
-    notmuch_rb_query_t *query;
-    notmuch_rb_threads_t *threads;
-    VALUE threadsv;
+    notmuch_query_t *query;
+    notmuch_threads_t *threads;
 
-    Data_Get_Struct(self, notmuch_rb_query_t, query);
+    Data_Get_Notmuch_Query (self, query);
 
-    threadsv = Data_Make_Struct(notmuch_rb_cThreads, notmuch_rb_threads_t,
-            notmuch_rb_threads_mark, notmuch_rb_threads_free, threads);
-    threads->nm_threads = notmuch_query_search_threads(query->nm_query);
-    threads->query = self;
-    if (!threads->nm_threads)
-        rb_raise(notmuch_rb_eMemoryError, "out of memory");
+    threads = notmuch_query_search_threads (query);
+    if (!threads)
+	rb_raise (notmuch_rb_eMemoryError, "Out of memory");
 
-    return threadsv;
+    return Data_Wrap_Struct (notmuch_rb_cThreads, NULL, NULL, threads);
 }
 
 /*
@@ -69,20 +132,35 @@ notmuch_rb_query_search_threads(VALUE self)
  * Search for messages
  */
 VALUE
-notmuch_rb_query_search_messages(VALUE self)
+notmuch_rb_query_search_messages (VALUE self)
 {
-    notmuch_rb_query_t *query;
-    notmuch_rb_messages_t *messages;
-    VALUE messagesv;
+    notmuch_query_t *query;
+    notmuch_messages_t *messages;
+
+    Data_Get_Notmuch_Query (self, query);
+
+    messages = notmuch_query_search_messages (query);
+    if (!messages)
+	rb_raise (notmuch_rb_eMemoryError, "Out of memory");
+
+    return Data_Wrap_Struct (notmuch_rb_cMessages, NULL, NULL, messages);
+}
 
-    Data_Get_Struct(self, notmuch_rb_query_t, query);
+/*
+ * call-seq: QUERY.count_messages => Fixnum
+ *
+ * Return an estimate of the number of messages matching a search
+ */
+VALUE
+notmuch_rb_query_count_messages (VALUE self)
+{
+    notmuch_query_t *query;
 
-    messagesv = Data_Make_Struct(notmuch_rb_cMessages, notmuch_rb_messages_t,
-            notmuch_rb_messages_mark, notmuch_rb_messages_free, messages);
-    messages->nm_messages = notmuch_query_search_messages(query->nm_query);
-    messages->parent = self;
-    if (!messages->nm_messages)
-        rb_raise(notmuch_rb_eMemoryError, "out of memory");
+    Data_Get_Notmuch_Query (self, query);
 
-    return messagesv;
+    /* 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));
 }