X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_tagset.c;h=2e32ef44ac1dade774cfc00ef365e069224444e9;hb=e63cb633d580e1a364de81d4f24fb2c9fa70e279;hp=89bf6bc3921c6f2422bc3d73c4423363f00ae7f0;hpb=22963c0b23a178529bc71e5879c7e4f9c3c9b7f9;p=idzebra-moved-to-github.git

diff --git a/data1/d1_tagset.c b/data1/d1_tagset.c
index 89bf6bc..2e32ef4 100644
--- a/data1/d1_tagset.c
+++ b/data1/d1_tagset.c
@@ -1,6 +1,6 @@
-/* $Id: d1_tagset.c,v 1.3 2004-09-28 10:15:03 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: d1_tagset.c,v 1.6 2005-01-15 19:38:18 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -129,7 +129,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 
     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;
     }
     res = data1_empty_tagset (dh);
@@ -149,7 +149,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 
 	    if (argc != 4)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # args to tag", file, lineno);
+		yaz_log(YLOG_WARN, "%s:%d: Bad # args to tag", file, lineno);
 		continue;
 	    }
 	    value = atoi(argv[1]);
@@ -167,7 +167,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 
 	    if (!(rr->kind = data1_maptype(dh, type)))
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Unknown datatype %s",
+		yaz_log(YLOG_WARN, "%s:%d: Unknown datatype %s",
 		     file, lineno, type);
 		fclose(f);
 		return 0;
@@ -195,7 +195,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 	{
 	    if (argc != 2)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # args to name", file, lineno);
+		yaz_log(YLOG_WARN, "%s:%d: Bad # args to name", file, lineno);
 		continue;
 	    }
 	    res->name = nmem_strdup(mem, argv[1]);
@@ -206,14 +206,14 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 	    
 	    if (argc != 2)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # args to reference",
+		yaz_log(YLOG_WARN, "%s:%d: Bad # args to reference",
 			file, lineno);
 		continue;
 	    }
 	    name = argv[1];
 	    if ((res->reference = oid_getvalbyname(name)) == VAL_NONE)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Unknown tagset ref '%s'",
+		yaz_log(YLOG_WARN, "%s:%d: Unknown tagset ref '%s'",
 			file, lineno, name);
 		continue;
 	    }
@@ -222,7 +222,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 	{
 	    if (argc != 2)
 	    {
-		yaz_log (LOG_WARN, "%s:%d: Bad # args to type", file, lineno);
+		yaz_log (YLOG_WARN, "%s:%d: Bad # args to type", file, lineno);
 		continue;
 	    }
 	    if (!res->type)
@@ -235,7 +235,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 
 	    if (argc < 2)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # args to include",
+		yaz_log(YLOG_WARN, "%s:%d: Bad # args to include",
 			file, lineno);
 		continue;
 	    }
@@ -245,7 +245,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 	    *childp = data1_read_tagset (dh, name, type);
 	    if (!(*childp))
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Inclusion failed for tagset %s",
+		yaz_log(YLOG_WARN, "%s:%d: Inclusion failed for tagset %s",
 			file, lineno, name);
 		continue;
 	    }
@@ -253,7 +253,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 	}
 	else
 	{
-	    yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+	    yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'",
 		    file, lineno, cmd);
 	}
     }