using yaz/log.h again

[idzebra-moved-to-github.git] / data1 / d1_tagset.c

diff --git a/data1/d1_tagset.c b/data1/d1_tagset.c
index 8b1ada6..fdf2309 100644 (file)
--- a/data1/d1_tagset.c
+++ b/data1/d1_tagset.c
@@ -1,17 +1,31 @@
-/*
- * Copyright (c) 1995-2002, Index Data.
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: d1_tagset.c,v 1.1 2002-10-22 12:53:33 adam Exp $
- */
+/* $Id: d1_tagset.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
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <yaz/log.h>
-#include <data1.h>
+#include <idzebra/data1.h>
 
 /*
  * We'll probably want to add some sort of hashed index to these lookup-
@@ -115,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);
@@ -135,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]);
@@ -153,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;
@@ -181,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]);
@@ -192,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;
            }
@@ -208,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)
@@ -221,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;
            }
@@ -231,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;
            }
@@ -239,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);
        }
     }