debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch search: Use "thread" rather than "id" when formatting with JSON

Browse source 
The text output uses thread:<foo>, (which is a syntax directly supported
by "notmuch show"), so make the json output be "thread", "<foo>" rather
than "id", "<foo>". This should help avoid confusion of thread IDs with
message IDs, (which do use the "id" prefix in searches).
This commit is contained in:
Carl Worth 2010-02-23 12:41:59 -08:00
parent cfa95eec27
commit 5171831813
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
notmuch-search.c
View file

@ -24,7 +24,7 @@ typedef struct search_format {
const char *results_start; const char *results_start;
const char *thread_start; const char *thread_start;
void (*thread) (const void *ctx, void (*thread) (const void *ctx,
const char *id, const char *thread_id,
const time_t date, const time_t date,
const int matched, const int matched,
const int total, const int total,
@ -41,7 +41,7 @@ typedef struct search_format {
static void static void
format_thread_text (const void *ctx, format_thread_text (const void *ctx,
const char *id, const char *thread_id,
const time_t date, const time_t date,
const int matched, const int matched,
const int total, const int total,
@ -60,7 +60,7 @@ static const search_format_t format_text = {
static void static void
format_thread_json (const void *ctx, format_thread_json (const void *ctx,
const char *id, const char *thread_id,
const time_t date, const time_t date,
const int matched, const int matched,
const int total, const int total,
@ -79,7 +79,7 @@ static const search_format_t format_json = {
static void static void
format_thread_text (const void *ctx, format_thread_text (const void *ctx,
const char *id, const char *thread_id,
const time_t date, const time_t date,
const int matched, const int matched,
const int total, const int total,
@ -87,7 +87,7 @@ format_thread_text (const void *ctx,
const char *subject) const char *subject)
{ {
printf ("thread:%s %12s [%d/%d] %s; %s", printf ("thread:%s %12s [%d/%d] %s; %s",
id, thread_id,
notmuch_time_relative_date (ctx, date), notmuch_time_relative_date (ctx, date),
matched, matched,
total, total,
@ -97,7 +97,7 @@ format_thread_text (const void *ctx,
static void static void
format_thread_json (const void *ctx, format_thread_json (const void *ctx,
const char *id, const char *thread_id,
const time_t date, const time_t date,
const int matched, const int matched,
const int total, const int total,
@ -110,18 +110,18 @@ format_thread_json (const void *ctx,
tm = gmtime (&date); tm = gmtime (&date);
if (tm == NULL) if (tm == NULL)
INTERNAL_ERROR ("gmtime failed on thread %s.", id); INTERNAL_ERROR ("gmtime failed on thread %s.", thread_id);
if (strftime (timestamp, sizeof (timestamp), "%s", tm) == 0) if (strftime (timestamp, sizeof (timestamp), "%s", tm) == 0)
INTERNAL_ERROR ("strftime failed on thread %s.", id); INTERNAL_ERROR ("strftime failed on thread %s.", thread_id);
printf ("\"id\": %s,\n" printf ("\"thread\": %s,\n"
"\"timestamp\": %s,\n" "\"timestamp\": %s,\n"
"\"matched\": %d,\n" "\"matched\": %d,\n"
"\"total\": %d,\n" "\"total\": %d,\n"
"\"authors\": %s,\n" "\"authors\": %s,\n"
"\"subject\": %s,\n", "\"subject\": %s,\n",
json_quote_str (ctx_quote, id), json_quote_str (ctx_quote, thread_id),
timestamp, timestamp,
matched, matched,
total, total,