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
Added wrbuf_put - same as wrbuf_puts but void return value.
[yaz-moved-to-github.git]
/
src
/
marc_read_xml.c
diff --git
a/src/marc_read_xml.c
b/src/marc_read_xml.c
index
caf5a55
..
c4b2190
100644
(file)
--- a/
src/marc_read_xml.c
+++ b/
src/marc_read_xml.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: marc_read_xml.c,v 1.3 2007-05-06 20:12:20 adam Exp $
*/
/**
*/
/**
@@
-118,7
+116,6
@@
static int yaz_marc_read_xml_leader(yaz_marc_t mt, const xmlNode **ptr_p)
{
yaz_marc_cprintf(
mt, "Expected element 'leader', got '%.80s'", ptr->name);
{
yaz_marc_cprintf(
mt, "Expected element 'leader', got '%.80s'", ptr->name);
- return -1;
}
}
if (!leader)
}
}
if (!leader)
@@
-194,7
+191,6
@@
static int yaz_marc_read_xml_fields(yaz_marc_t mt, const xmlNode *ptr)
yaz_marc_cprintf(
mt, "Bad attribute '%.80s' for 'datafield'",
attr->name);
yaz_marc_cprintf(
mt, "Bad attribute '%.80s' for 'datafield'",
attr->name);
- return -1;
}
if (!ptr_tag)
{
}
if (!ptr_tag)
{
@@
-224,6
+220,8
@@
static int yaz_marc_read_xml_fields(yaz_marc_t mt, const xmlNode *ptr)
int yaz_marc_read_xml(yaz_marc_t mt, const xmlNode *ptr)
{
#if YAZ_HAVE_XML2
int yaz_marc_read_xml(yaz_marc_t mt, const xmlNode *ptr)
{
#if YAZ_HAVE_XML2
+ yaz_marc_reset(mt);
+
for(; ptr; ptr = ptr->next)
if (ptr->type == XML_ELEMENT_NODE)
{
for(; ptr; ptr = ptr->next)
if (ptr->type == XML_ELEMENT_NODE)
{