projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
[yaz-moved-to-github.git]
/
util
/
marcdump.c
diff --git
a/util/marcdump.c
b/util/marcdump.c
index
15021fe
..
0696df8
100644
(file)
--- a/
util/marcdump.c
+++ b/
util/marcdump.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2010 Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
@@
-133,7
+133,7
@@
static void marcdump_read_xml(yaz_marc_t mt, const char *fname)
{
const char *name = (const char *)
xmlTextReaderLocalName(reader);
{
const char *name = (const char *)
xmlTextReaderLocalName(reader);
- if (!strcmp(name, "record"))
+ if (!strcmp(name, "record") || !strcmp(name, "r"))
{
xmlNodePtr ptr = xmlTextReaderExpand(reader);
{
xmlNodePtr ptr = xmlTextReaderExpand(reader);
@@
-142,7
+142,9
@@
static void marcdump_read_xml(yaz_marc_t mt, const char *fname)
fprintf(stderr, "yaz_marc_read_xml failed\n");
else
{
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);
fputs(wrbuf_cstr(wrbuf), stdout);
wrbuf_rewind(wrbuf);
@@
-165,7
+167,8
@@
static void marcdump_read_xml(yaz_marc_t mt, const char *fname)
ptr = ptr->children;
continue;
}
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)
{
int r = yaz_marc_read_xml(mt, ptr);
if (r)
@@
-215,12
+218,12
@@
static void dump(const char *fname, const char *from, const char *to,
}
yaz_marc_iconv(mt, cd);
}
}
yaz_marc_iconv(mt, cd);
}
- yaz_marc_xml(mt, output_format);
yaz_marc_enable_collection(mt);
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);
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);
{
#if YAZ_HAVE_XML2
marcdump_read_xml(mt, fname);
@@
-440,8
+443,14
@@
int main (int argc, char **argv)
rather than WRBUF */
if (strlen(arg) > 4 && strncmp(arg, "xml,", 4) == 0)
{
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;
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)
}
output_format = yaz_marc_decode_formatstr(arg);
if (output_format == -1)