lib: Fix notmuch_query_search_threads to return NULL on any Xapian exception.

[notmuch] / notmuch-search.c

diff --git a/notmuch-search.c b/notmuch-search.c
index 25dd6eba370b4b302135dc518ca7b4db1e285484..8a1cdca3f1dcce5feea71a580c250e4bfabe9084 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -104,25 +104,16 @@ format_thread_json (const void *ctx,
                    const char *authors,
                    const char *subject)
 {
-    struct tm *tm;
-    char timestamp[40];
     void *ctx_quote = talloc_new (ctx);
 
-    tm = gmtime (&date);
-    if (tm == NULL)
-       INTERNAL_ERROR ("gmtime failed on thread %s.", thread_id);
-
-    if (strftime (timestamp, sizeof (timestamp), "%s", tm) == 0)
-       INTERNAL_ERROR ("strftime failed on thread %s.", thread_id);
-
     printf ("\"thread\": %s,\n"
-           "\"timestamp\": %s,\n"
+           "\"timestamp\": %ld,\n"
            "\"matched\": %d,\n"
            "\"total\": %d,\n"
            "\"authors\": %s,\n"
            "\"subject\": %s,\n",
            json_quote_str (ctx_quote, thread_id),
-           timestamp,
+           date,
            matched,
            total,
            json_quote_str (ctx_quote, authors),
@@ -146,8 +137,8 @@ do_search_threads (const void *ctx,
     fputs (format->results_start, stdout);
 
     for (threads = notmuch_query_search_threads (query);
-        notmuch_threads_has_more (threads);
-        notmuch_threads_advance (threads))
+        notmuch_threads_valid (threads);
+        notmuch_threads_move_to_next (threads))
     {
        int first_tag = 1;
 
@@ -174,8 +165,8 @@ do_search_threads (const void *ctx,
        fputs (format->tag_start, stdout);
 
        for (tags = notmuch_thread_get_tags (thread);
-            notmuch_tags_has_more (tags);
-            notmuch_tags_advance (tags))
+            notmuch_tags_valid (tags);
+            notmuch_tags_move_to_next (tags))
        {
            if (! first_tag)
                fputs (format->tag_sep, stdout);