2007.

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

diff --git a/data1/d1_varset.c b/data1/d1_varset.c
index 06c47d2..bc0c8dd 100644 (file)
--- a/data1/d1_varset.c
+++ b/data1/d1_varset.c
@@ -1,6 +1,6 @@
-/* $Id: d1_varset.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_varset.c,v 1.10 2007-01-15 15:10:14 adam Exp $
+   Copyright (C) 1995-2007
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -15,9 +15,9 @@ 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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <string.h>
@@ -28,7 +28,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <d1_absyn.h>
 
 data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
-                                    char *zclass, char *type)
+                                    const char *zclass, const char *type)
 {
     data1_varclass *c;
     data1_vartype *t;
@@ -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,21 +138,29 @@ 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);
     return res;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+