[PATCH 3/4] ruby: update bindings for new count API

diff --git a/4f/fcee7504bff6296b4d6c1d897b2d80865469af b/4f/fcee7504bff6296b4d6c1d897b2d80865469af
new file mode 100644 (file)
index 0000000..a1bcb93
--- /dev/null
+++ b/4f/fcee7504bff6296b4d6c1d897b2d80865469af
@@ -0,0 +1,107 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id D1A86431FC3\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Mar 2015 00:44:35 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+       tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id dvrd5YXFPaVD for <notmuch@notmuchmail.org>;\r
+       Sat,  7 Mar 2015 00:44:35 -0800 (PST)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+       [87.98.215.224])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 8F2E6431FBC\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Mar 2015 00:44:32 -0800 (PST)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+       4.80) (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1YUAKs-0002Jo-Gp; Sat, 07 Mar 2015 08:43:50 +0000\r
+Received: (nullmailer pid 20412 invoked by uid 1000); Sat, 07 Mar 2015\r
+       08:43:23 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/4] ruby: update bindings for new count API\r
+Date: Sat,  7 Mar 2015 09:43:16 +0100\r
+Message-Id: <1425717797-19990-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1425717797-19990-1-git-send-email-david@tethera.net>\r
+References: <1419971380-10307-6-git-send-email-david@tethera.net>\r
+       <1425717797-19990-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 07 Mar 2015 08:44:36 -0000\r
+\r
+Compared to the CLI changes, this does something clearly useful,\r
+transforming an error status into a ruby exception.\r
+---\r
+ bindings/ruby/query.c | 26 ++++++++++++++++----------\r
+ 1 file changed, 16 insertions(+), 10 deletions(-)\r
+\r
+diff --git a/bindings/ruby/query.c b/bindings/ruby/query.c\r
+index a7dacba..ea9ca37 100644\r
+--- a/bindings/ruby/query.c\r
++++ b/bindings/ruby/query.c\r
+@@ -173,14 +173,17 @@ VALUE\r
+ notmuch_rb_query_count_messages (VALUE self)\r
+ {\r
+     notmuch_query_t *query;\r
++    notmuch_status_t status;\r
++    unsigned count;\r
+ \r
+     Data_Get_Notmuch_Query (self, query);\r
+ \r
+-    /* Xapian exceptions are not handled properly.\r
+-     * (function may return 0 after printing a message)\r
+-     * Thus there is nothing we can do here...\r
+-     */\r
+-    return UINT2NUM(notmuch_query_count_messages(query));\r
++    status = notmuch_query_count_messages_st (query, &count);\r
++\r
++    if (status)\r
++      notmuch_rb_status_raise (status);\r
++    else\r
++      return UINT2NUM(count);\r
+ }\r
+ \r
+ /*\r
+@@ -192,12 +195,15 @@ VALUE\r
+ notmuch_rb_query_count_threads (VALUE self)\r
+ {\r
+     notmuch_query_t *query;\r
++    notmuch_status_t status;\r
++    unsigned count;\r
+ \r
+     Data_Get_Notmuch_Query (self, query);\r
+ \r
+-    /* Xapian exceptions are not handled properly.\r
+-     * (function may return 0 after printing a message)\r
+-     * Thus there is nothing we can do here...\r
+-     */\r
+-    return UINT2NUM(notmuch_query_count_threads(query));\r
++    status = notmuch_query_count_threads_st (query, &count);\r
++    if (status)\r
++      notmuch_rb_status_raise (status);\r
++    else\r
++      return UINT2NUM(count);\r
++\r
+ }\r
+-- \r
+2.1.4\r
+\r