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

diff --git a/recctrl/xmlread.c b/recctrl/xmlread.c
index a5bd006..08c3e23 100644
--- a/recctrl/xmlread.c
+++ b/recctrl/xmlread.c
@@ -1,6 +1,6 @@
-/* $Id: xmlread.c,v 1.15 2004-09-28 10:15:03 adam 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.
 
@@ -34,8 +34,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <idzebra/recgrs.h>
 
-#include <yaz/xmalloc.h>
 #include <yaz/log.h>
+#include <yaz/xmalloc.h>
 
 #include <expat.h>
 
@@ -98,7 +98,7 @@ static void cb_decl (void *user, const char *version, const char *encoding,
     data1_mk_preprocess (ui->dh, ui->nmem, "xml", attr_list,
                              ui->d1_stack[ui->level-1]);
 #if 0
-    yaz_log (LOG_LOG, "decl version=%s encoding=%s",
+    yaz_log (YLOG_LOG, "decl version=%s encoding=%s",
              version ? version : "null",
              encoding ? encoding : "null");
 #endif
@@ -175,7 +175,7 @@ static int cb_external_entity (XML_Parser pparser,
 
     if (!(inf = fopen (systemId, "rb")))
     {
-        yaz_log (LOG_WARN|LOG_ERRNO, "fopen %s", systemId);
+        yaz_log (YLOG_WARN|YLOG_ERRNO, "fopen %s", systemId);
         return 0;
     }
 
@@ -186,7 +186,7 @@ static int cb_external_entity (XML_Parser pparser,
         void *buf = XML_GetBuffer (parser, XML_CHUNK);
         if (!buf)
         {
-            yaz_log (LOG_WARN, "XML_GetBuffer fail");
+            yaz_log (YLOG_WARN, "XML_GetBuffer fail");
             break;
         }
         r = fread (buf, 1, XML_CHUNK, inf);
@@ -194,7 +194,7 @@ static int cb_external_entity (XML_Parser pparser,
         {
             if (ferror(inf))
             {
-                yaz_log (LOG_WARN|LOG_ERRNO, "fread %s", systemId);
+                yaz_log (YLOG_WARN|YLOG_ERRNO, "fread %s", systemId);
                 break;
             }
             done = 1;
@@ -202,7 +202,7 @@ static int cb_external_entity (XML_Parser pparser,
         if (!XML_ParseBuffer (parser, r, done))
         {
 	    done = 1;
-	    yaz_log (LOG_WARN, "%s:%d:%d:XML error: %s",
+	    yaz_log (YLOG_WARN, "%s:%d:%d:XML error: %s",
 		     systemId,
 		     XML_GetCurrentLineNumber(parser),
 		     XML_GetCurrentColumnNumber(parser),
@@ -227,7 +227,7 @@ static int cb_encoding_convert (void *data, const char *s)
     unsigned short code;
 
 #if 1
-    yaz_log(LOG_LOG, "------------------------- cb_encoding_convert --- ");
+    yaz_log(YLOG_LOG, "------------------------- cb_encoding_convert --- ");
 #endif
     ret = iconv (t, &inbuf, &inleft, &outbuf, &outleft);
     if (ret == (size_t) (-1) && errno != E2BIG)
@@ -343,7 +343,7 @@ static int cb_encoding_handler (void *userData, const char *name,
             {
                 info->map[i] = -1;  /* no room for output */
                 if (i != 0)
-                    yaz_log (LOG_WARN, "Encoding %d: no room for output",
+                    yaz_log (YLOG_WARN, "Encoding %d: no room for output",
                              i);
             }
         }
@@ -357,7 +357,7 @@ static int cb_encoding_handler (void *userData, const char *name,
         else
         {   /* should never happen */
             info->map[i] = -1;
-            yaz_log (LOG_DEBUG, "Encoding %d: bad state", i);
+            yaz_log (YLOG_DEBUG, "Encoding %d: bad state", i);
         }
     }
     if (info->data)
@@ -401,7 +401,7 @@ data1_node *zebra_read_xml (data1_handle dh,
     int done = 0;
     data1_node *first_node;
 
-    uinfo.loglevel = LOG_DEBUG;
+    uinfo.loglevel = YLOG_DEBUG;
     uinfo.level = 1;
     uinfo.dh = dh;
     uinfo.nmem = m;
@@ -430,14 +430,14 @@ data1_node *zebra_read_xml (data1_handle dh,
         if (!buf)
         {
             /* error */
-            yaz_log (LOG_WARN, "XML_GetBuffer fail");
+            yaz_log (YLOG_WARN, "XML_GetBuffer fail");
             break;
         }
         r = (*rf)(fh, buf, XML_CHUNK);
         if (r < 0)
         {
             /* error */
-            yaz_log (LOG_WARN, "XML read fail");
+            yaz_log (YLOG_WARN, "XML read fail");
             break;
         }
         else if (r == 0)
@@ -445,7 +445,7 @@ data1_node *zebra_read_xml (data1_handle dh,
         if (!XML_ParseBuffer (parser, r, done))
         {
 	    done = 1;
-	    yaz_log (LOG_WARN, "%d:%d:XML error: %s",
+	    yaz_log (YLOG_WARN, "%d:%d:XML error: %s",
 		     XML_GetCurrentLineNumber(parser),
 		     XML_GetCurrentColumnNumber(parser),
 		     XML_ErrorString(XML_GetErrorCode(parser)));
@@ -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,
 };