X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fzebramap.c;h=df217db2dc65b2730a90421a5bc22d5f9bc3a19e;hb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;hp=ab9ca864eb36942dd5cc74f7a2d72028d70327a0;hpb=36f8c4a15cad06268b2d5621aed28ab16c015cc5;p=idzebra-moved-to-github.git

diff --git a/util/zebramap.c b/util/zebramap.c
index ab9ca86..df217db 100644
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -1,6 +1,6 @@
-/* $Id: zebramap.c,v 1.34 2004-09-28 12:39:55 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: zebramap.c,v 1.38 2005-01-15 19:38:42 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -25,8 +25,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <assert.h>
 #include <ctype.h>
 
-#include <yaz/yaz-util.h>
 #include <charmap.h>
+#include <yaz/yaz-util.h>
+
 #include <idzebra/zebramap.h>
 
 #define ZEBRA_MAP_TYPE_SORT  1
@@ -97,7 +98,7 @@ static void zebra_map_read (ZebraMaps zms, const char *name)
 
     if (!(f = yaz_fopen(zms->tabpath, name, "r", zms->tabroot)))
     {
-	logf(LOG_WARN|LOG_ERRNO, "%s", name);
+	yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", name);
 	return ;
     }
     while ((argc = readconf_line(f, &lineno, line, 512, argv, 10)))
@@ -156,7 +157,7 @@ static void zebra_map_read (ZebraMaps zms, const char *name)
 	    token->next = (*zm)->replace_tokens;
 	    (*zm)->replace_tokens = token;
 #if 0
-	    logf (LOG_LOG, "replace %s", argv[1]);
+	    yaz_log (YLOG_LOG, "replace %s", argv[1]);
 #endif
 	    token->token_from = 0;
             if (argc >= 2)
@@ -179,7 +180,7 @@ static void zebra_map_read (ZebraMaps zms, const char *name)
 		    {
 		        *dp++ = zebra_prim(&cp);
 #if 0
-			logf (LOG_LOG, "  char %2X %c", dp[-1], dp[-1]);
+			yaz_log (YLOG_LOG, "  char %2X %c", dp[-1], dp[-1]);
 #endif
 		    }
 	        *dp = '\0';
@@ -262,7 +263,7 @@ chrmaptab zebra_charmap_get (ZebraMaps zms, unsigned reg_id)
     if (!zm)
     {
 	zm = (struct zebra_map *) nmem_malloc (zms->nmem, sizeof(*zm));
-	logf (LOG_WARN, "Unknown register type: %c", reg_id);
+	yaz_log (YLOG_WARN, "Unknown register type: %c", reg_id);
 
 	zm->reg_id = reg_id;
 	zm->maptab_name = nmem_strdup (zms->nmem, "@");
@@ -282,10 +283,10 @@ chrmaptab zebra_charmap_get (ZebraMaps zms, unsigned reg_id)
 	if (!(zm->maptab = chrmaptab_create (zms->tabpath,
 					     zm->maptab_name, 0,
                                              zms->tabroot)))
-	    logf(LOG_WARN, "Failed to read character table %s",
+	    yaz_log(YLOG_WARN, "Failed to read character table %s",
 		 zm->maptab_name);
 	else
-	    logf(LOG_DEBUG, "Read character table %s", zm->maptab_name);
+	    yaz_log(YLOG_DEBUG, "Read character table %s", zm->maptab_name);
     }
     return zm->maptab;
 }
@@ -546,7 +547,7 @@ WRBUF zebra_replace(ZebraMaps zms, unsigned reg_id, const char *ex_list,
 	return zms->wrbuf_1;
   
 #if 0
-    logf (LOG_LOG, "in:%.*s:", wrbuf_len(zms->wrbuf_1),
+    yaz_log (YLOG_LOG, "in:%.*s:", wrbuf_len(zms->wrbuf_1),
 	  wrbuf_buf(zms->wrbuf_1));
 #endif
     for (;;)
@@ -633,7 +634,7 @@ int zebra_replace_sub(ZebraMaps zms, unsigned reg_id, const char *ex_list,
 	}
     }
 #if 0
-    logf (LOG_LOG, "out:%.*s:", wrbuf_len(wrbuf), wrbuf_buf(wrbuf));
+    yaz_log (YLOG_LOG, "out:%.*s:", wrbuf_len(wrbuf), wrbuf_buf(wrbuf));
 #endif
     return no_replaces;
 }