/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <yaz/json.h>
#include <yaz/wrbuf.h>
#include <yaz/options.h>
+#include <yaz/backtrace.h>
void usage(const char *prog)
{
FILE *f = stdin;
WRBUF w = wrbuf_alloc();
struct json_node *n;
+ size_t pos;
const char *json_str;
const char *err_msg;
int c;
while ((c = getc(f)) != EOF)
wrbuf_putc(w, c);
json_str = wrbuf_cstr(w);
- n = json_parse(json_str, &err_msg);
+ n = json_parse2(json_str, &err_msg, &pos);
if (!n)
- fprintf(stderr, "JSON parse error: %s\n", err_msg);
+ {
+ fprintf(stderr, "JSON parse error: %s\nLeading text was:\n", err_msg);
+ fwrite(json_str, 1, pos, stderr);
+ fprintf(stderr, "^\n");
+ }
wrbuf_destroy(w);
return n;
}
int print = 0;
int ret;
char *arg;
+
+ yaz_enable_panic_backtrace(*argv);
while ((ret = options("p", argv, argc, &arg)) != YAZ_OPTIONS_EOF)
{
switch (ret)
{
case 'p':
- print = 1;
+ print++;
break;
default:
usage(argv[0]);
if (print)
{
WRBUF result = wrbuf_alloc();
- json_write_wrbuf(n, result);
+ if (print > 1)
+ json_write_wrbuf_pretty(n, result);
+ else
+ json_write_wrbuf(n, result);
puts(wrbuf_cstr(result));
wrbuf_destroy(result);
}