const char *results_start;
const char *thread_start;
void (*thread) (const void *ctx,
- const char *id,
+ const char *thread_id,
const time_t date,
const int matched,
const int total,
static void
format_thread_text (const void *ctx,
- const char *id,
+ const char *thread_id,
const time_t date,
const int matched,
const int total,
static void
format_thread_json (const void *ctx,
- const char *id,
+ const char *thread_id,
const time_t date,
const int matched,
const int total,
static void
format_thread_text (const void *ctx,
- const char *id,
+ const char *thread_id,
const time_t date,
const int matched,
const int total,
const char *subject)
{
printf ("thread:%s %12s [%d/%d] %s; %s",
- id,
+ thread_id,
notmuch_time_relative_date (ctx, date),
matched,
total,
static void
format_thread_json (const void *ctx,
- const char *id,
+ const char *thread_id,
const time_t date,
const int matched,
const int total,
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.", id);
-
- if (strftime (timestamp, sizeof (timestamp), "%s", tm) == 0)
- INTERNAL_ERROR ("strftime failed on thread %s.", id);
-
- printf ("\"id\": %s,\n"
- "\"timestamp\": %s,\n"
+ printf ("\"thread\": %s,\n"
+ "\"timestamp\": %ld,\n"
"\"matched\": %d,\n"
"\"total\": %d,\n"
"\"authors\": %s,\n"
"\"subject\": %s,\n",
- json_quote_str (ctx_quote, id),
- timestamp,
+ json_quote_str (ctx_quote, thread_id),
+ date,
matched,
total,
json_quote_str (ctx_quote, authors),
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;
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);