-/* $Id: xmlread.c,v 1.16 2004-11-19 10:27:13 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: xmlread.c,v 1.21 2006-05-10 08:13:31 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
#include <iconv.h>
#endif
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/recgrs.h>
+#include <yaz/log.h>
#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
#include <expat.h>
struct user_info uinfo;
int done = 0;
data1_node *first_node;
+ int no_read = 0;
uinfo.loglevel = YLOG_DEBUG;
uinfo.level = 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",
}
}
XML_ParserFree (parser);
+ if (no_read == 0)
+ return 0;
if (!uinfo.d1_stack[1] || !done)
return 0;
/* insert XML header if not present .. */
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));
return p;
}
-static void destroy_xml(void *clientData)
+static void filter_destroy(void *clientData)
{
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);
}
-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);
}
-static struct recType xml_type = {
+static struct recType filter_type = {
+ 0,
"grs.xml",
- init_xml,
+ filter_init,
0,
- destroy_xml,
- extract_xml,
- retrieve_xml,
+ filter_destroy,
+ filter_extract,
+ filter_retrieve,
};
RecType
#endif
[] = {
- &xml_type,
+ &filter_type,
0,
};
#endif
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+