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
Add extra argument to zebraExplain_lookup_ord so that we can get
[idzebra-moved-to-github.git]
/
recctrl
/
xmlread.c
diff --git
a/recctrl/xmlread.c
b/recctrl/xmlread.c
index
52bb098
..
4a05b57
100644
(file)
--- a/
recctrl/xmlread.c
+++ b/
recctrl/xmlread.c
@@
-1,6
+1,6
@@
-/* $Id: xmlread.c,v 1.17 2004-12-13 20:51:32 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: xmlread.c,v 1.20 2005-06-14 18:27:23 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-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 .. */
@@
-484,7
+489,7
@@
static data1_node *grs_read_xml (struct grs_read_info *p)
return zebra_read_xml (p->dh, p->readf, p->fh, p->mem);
}
return zebra_read_xml (p->dh, p->readf, p->fh, p->mem);
}
-static void *init_xml(Res res, RecType recType)
+static void *filter_init(Res res, RecType recType)
{
struct xml_info *p = (struct xml_info *) xmalloc (sizeof(*p));
{
struct xml_info *p = (struct xml_info *) xmalloc (sizeof(*p));
@@
-493,30
+498,31
@@
static void *init_xml(Res res, RecType recType)
return p;
}
return p;
}
-static void destroy_xml(void *clientData)
+static void filter_destroy(void *clientData)
{
struct xml_info *p = (struct xml_info *) clientData;
xfree (p);
}
{
struct xml_info *p = (struct xml_info *) clientData;
xfree (p);
}
-static int extract_xml(void *clientData, struct recExtractCtrl *ctrl)
+static int filter_extract(void *clientData, struct recExtractCtrl *ctrl)
{
return zebra_grs_extract(clientData, ctrl, grs_read_xml);
}
{
return zebra_grs_extract(clientData, ctrl, grs_read_xml);
}
-static int retrieve_xml(void *clientData, struct recRetrieveCtrl *ctrl)
+static int filter_retrieve(void *clientData, struct recRetrieveCtrl *ctrl)
{
return zebra_grs_retrieve(clientData, ctrl, grs_read_xml);
}
{
return zebra_grs_retrieve(clientData, ctrl, grs_read_xml);
}
-static struct recType xml_type = {
+static struct recType filter_type = {
+ 0,
"grs.xml",
"grs.xml",
- init_xml,
+ filter_init,
0,
0,
- destroy_xml,
- extract_xml,
- retrieve_xml,
+ filter_destroy,
+ filter_extract,
+ filter_retrieve,
};
RecType
};
RecType
@@
-527,7
+533,7
@@
idzebra_filter
#endif
[] = {
#endif
[] = {
- &xml_type,
+ &filter_type,
0,
};
0,
};