X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_varset.c;h=5661a6b667f417a2172c7800c70bb27453034e2c;hp=06c47d2fb382e6b8afdb316e39299dc81d4867ca;hb=4eb3b54bb2ca9af74f39f000d3d40dba99ded887;hpb=22963c0b23a178529bc71e5879c7e4f9c3c9b7f9

diff --git a/data1/d1_varset.c b/data1/d1_varset.c
index 06c47d2..5661a6b 100644
--- a/data1/d1_varset.c
+++ b/data1/d1_varset.c
@@ -1,4 +1,4 @@
-/* $Id: d1_varset.c,v 1.3 2004-09-28 10:15:03 adam Exp $
+/* $Id: d1_varset.c,v 1.5 2004-12-13 20:51:28 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -39,11 +39,11 @@ data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
 	    for (t = c->types; t; t = t->next)
 		if (!data1_matchstr(t->name, type))
 		    return t;
-	    yaz_log(LOG_WARN, "Unknown variant type %s in class %s",
+	    yaz_log(YLOG_WARN, "Unknown variant type %s in class %s",
 		    type, zclass);
 	    return 0;
 	}
-    yaz_log(LOG_WARN, "Unknown variant class %s", zclass);
+    yaz_log(YLOG_WARN, "Unknown variant class %s", zclass);
     return 0;
 }
 
@@ -70,7 +70,7 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
 
     if (!(f = data1_path_fopen(dh, file, "r")))
     {
-	yaz_log(LOG_WARN|LOG_ERRNO, "%s", file);
+	yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", file);
 	return 0;
     }
     while ((argc = readconf_line(f, &lineno, line, 512, argv, 50)))
@@ -80,7 +80,7 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
 	    
 	    if (argc != 3)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # or args to class",
+		yaz_log(YLOG_WARN, "%s:%d: Bad # or args to class",
 			file, lineno);
 		continue;
 	    }
@@ -100,13 +100,13 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
 
 	    if (!typep)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Directive class must precede type",
+		yaz_log(YLOG_WARN, "%s:%d: Directive class must precede type",
 			file, lineno);
 		continue;
 	    }
 	    if (argc != 4)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # or args to type",
+		yaz_log(YLOG_WARN, "%s:%d: Bad # or args to type",
 			file, lineno);
 		continue;
 	    }
@@ -116,7 +116,7 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
 	    r->type = atoi(argv[1]);
 	    if (!(r->datatype = data1_maptype (dh, argv[3])))
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Unknown datatype '%s'",
+		yaz_log(YLOG_WARN, "%s:%d: Unknown datatype '%s'",
 			file, lineno, argv[3]);
 		fclose(f);
 		return 0;
@@ -128,7 +128,7 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
 	{
 	    if (argc != 2)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # args for name",
+		yaz_log(YLOG_WARN, "%s:%d: Bad # args for name",
 			file, lineno);
 		continue;
 	    }
@@ -138,19 +138,19 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
 	{
 	    if (argc != 2)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # args for reference",
+		yaz_log(YLOG_WARN, "%s:%d: Bad # args for reference",
 			file, lineno);
 		continue;
 	    }
 	    if ((res->reference = oid_getvalbyname(argv[1])) == VAL_NONE)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Unknown reference '%s'",
+		yaz_log(YLOG_WARN, "%s:%d: Unknown reference '%s'",
 			file, lineno, argv[1]);
 		continue;
 	    }
 	}
 	else 
-	    yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+	    yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'",
 		    file, lineno, argv[0]);
     
     fclose(f);