/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2010 Index Data
* See the file LICENSE for details.
*/
static void usage(const char *prog)
{
- fprintf (stderr, "Usage: %s [-c cfile] [-f from] [-t to] "
- "[-i format] [-o format] "
- "[-n] [-l pos=value] [-v] [-C chunk] [-s splitfname] [-p] file...\n",
+ fprintf (stderr, "Usage: %s [-i format] [-o format] [-f from] [-t to] "
+ "[-l pos=value] [-c cfile] [-s prefix] [-C size] [-n] "
+ "[-p] [-v] [-V] file...\n",
prog);
}
+static void show_version(void)
+{
+ char vstr[20], sha1_str[41];
+
+ yaz_version(vstr, sha1_str);
+ printf("YAZ version: %s %s\n", YAZ_VERSION, YAZ_VERSION_SHA1);
+ if (strcmp(sha1_str, YAZ_VERSION_SHA1))
+ printf("YAZ DLL/SO: %s %s\n", vstr, sha1_str);
+ exit(0);
+}
+
static int getbyte_stream(void *client_data)
{
FILE *f = (FILE*) client_data;
{
const char *name = (const char *)
xmlTextReaderLocalName(reader);
- if (!strcmp(name, "record"))
+ if (!strcmp(name, "record") || !strcmp(name, "r"))
{
xmlNodePtr ptr = xmlTextReaderExpand(reader);
fprintf(stderr, "yaz_marc_read_xml failed\n");
else
{
- yaz_marc_write_mode(mt, wrbuf);
+ int write_rc = yaz_marc_write_mode(mt, wrbuf);
+ if (write_rc)
+ yaz_log(YLOG_WARN, "yaz_marc_write_mode: write error: %d", write_rc);
fputs(wrbuf_cstr(wrbuf), stdout);
wrbuf_rewind(wrbuf);
ptr = ptr->children;
continue;
}
- if (!strcmp((const char *) ptr->name, "record"))
+ if (!strcmp((const char *) ptr->name, "record") ||
+ !strcmp((const char *) ptr->name, "r"))
{
int r = yaz_marc_read_xml(mt, ptr);
if (r)
}
yaz_marc_iconv(mt, cd);
}
- yaz_marc_xml(mt, output_format);
yaz_marc_enable_collection(mt);
+ yaz_marc_xml(mt, output_format);
yaz_marc_write_using_libxml2(mt, write_using_libxml2);
yaz_marc_debug(mt, verbose);
- if (input_format == YAZ_MARC_MARCXML || input_format == YAZ_MARC_XCHANGE)
+ if (input_format == YAZ_MARC_MARCXML || input_format == YAZ_MARC_TURBOMARC || input_format == YAZ_MARC_XCHANGE)
{
#if YAZ_HAVE_XML2
marcdump_read_xml(mt, fname);
}
len_result = rlen;
r = yaz_marc_decode_buf(mt, buf, -1, &result, &len_result);
- if (r > 0 && result)
+ if (r > 0 && result && len_result)
{
if (fwrite(result, len_result, 1, stdout) != 1)
{
#endif
prog = *argv;
- while ((r = options("i:o:C:npvc:xOeXIf:t:s:l:", argv, argc, &arg)) != -2)
+ while ((r = options("i:o:C:npc:xOeXIf:t:s:l:Vv", argv, argc, &arg)) != -2)
{
no++;
switch (r)
rather than WRBUF */
if (strlen(arg) > 4 && strncmp(arg, "xml,", 4) == 0)
{
+ /* Only supported for Libxml2 2.6.0 or later */
+#if LIBXML_VERSION >= 20600
arg = arg + 4;
write_using_libxml2 = 1;
+#else
+ fprintf(stderr, "%s: output using Libxml2 unsupported\n", prog);
+ exit(4);
+#endif
}
output_format = yaz_marc_decode_formatstr(arg);
if (output_format == -1)
case 'v':
verbose++;
break;
+ case 'V':
+ show_version();
+ break;
default:
usage(prog);
exit(1);
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab