X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Fxmlread.c;h=08c3e239c4ffccdcc35fa02fb5fc07e7be5af794;hb=9b9f570a2960c2c8a7026b2faee943794b08ce49;hp=aef219b53785a7f89d316a4a0a51d6ef385ca784;hpb=5437b50633032595afe6f87dc0f989bc92a5aea8;p=idzebra-moved-to-github.git

diff --git a/recctrl/xmlread.c b/recctrl/xmlread.c
index aef219b..08c3e23 100644
--- a/recctrl/xmlread.c
+++ b/recctrl/xmlread.c
@@ -1,6 +1,6 @@
-/* $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.19 2005-03-31 12:42:07 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -30,12 +30,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #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>
 
@@ -484,7 +484,7 @@ static data1_node *grs_read_xml (struct grs_read_info *p)
     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));
 
@@ -493,30 +493,31 @@ static void *init_xml(Res res, RecType recType)
     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
@@ -527,7 +528,7 @@ idzebra_filter
 #endif
 
 [] = {
-    &xml_type,
+    &filter_type,
     0,
 };