projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rolling mods to Marc's new ranking prose. (Check in early, check in
[idzebra-moved-to-github.git]
/
recctrl
/
xmlread.c
diff --git
a/recctrl/xmlread.c
b/recctrl/xmlread.c
index
08c3e23
..
4a05b57
100644
(file)
--- a/
recctrl/xmlread.c
+++ b/
recctrl/xmlread.c
@@
-1,4
+1,4
@@
-/* $Id: xmlread.c,v 1.19 2005-03-31 12:42:07 adam Exp $
+/* $Id: xmlread.c,v 1.20 2005-06-14 18:27:23 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-400,6
+400,7
@@
data1_node *zebra_read_xml (data1_handle dh,
struct user_info uinfo;
int done = 0;
data1_node *first_node;
struct user_info uinfo;
int done = 0;
data1_node *first_node;
+ int no_read = 0;
uinfo.loglevel = YLOG_DEBUG;
uinfo.level = 1;
uinfo.loglevel = YLOG_DEBUG;
uinfo.level = 1;
@@
-442,7
+443,9
@@
data1_node *zebra_read_xml (data1_handle dh,
}
else if (r == 0)
done = 1;
}
else if (r == 0)
done = 1;
- if (!XML_ParseBuffer (parser, r, done))
+ else
+ no_read += r;
+ if (no_read && !XML_ParseBuffer (parser, r, done))
{
done = 1;
yaz_log (YLOG_WARN, "%d:%d:XML error: %s",
{
done = 1;
yaz_log (YLOG_WARN, "%d:%d:XML error: %s",
@@
-452,6
+455,8
@@
data1_node *zebra_read_xml (data1_handle dh,
}
}
XML_ParserFree (parser);
}
}
XML_ParserFree (parser);
+ if (no_read == 0)
+ return 0;
if (!uinfo.d1_stack[1] || !done)
return 0;
/* insert XML header if not present .. */
if (!uinfo.d1_stack[1] || !done)
return 0;
/* insert XML header if not present .. */