{
const char *name = (const char *)
xmlTextReaderLocalName(reader);
- if (!strcmp(name, "record"))
+ if (!strcmp(name, "record") || !strcmp(name, "r"))
{
xmlNodePtr ptr = xmlTextReaderExpand(reader);
else
{
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);
+ 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_enable_collection(mt);
- yaz_marc_set_read_format(mt, input_format);
- yaz_marc_set_write_format(mt, output_format);
+ 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_TMARCXML || 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);
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)