New source grs1disp.c

[yaz-moved-to-github.git] / retrieval / d1_varset.c

diff --git a/retrieval/d1_varset.c b/retrieval/d1_varset.c
index adf3e2e..dbd1321 100644 (file)
--- a/retrieval/d1_varset.c
+++ b/retrieval/d1_varset.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (c) 1995-1998, Index Data.
+ * Copyright (c) 1995-1999, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_varset.c,v $
- * Revision 1.8  1998-10-13 16:09:54  adam
+ * Revision 1.11  2002-04-04 20:49:46  adam
+ * New functions yaz_is_abspath, yaz_path_fopen_base
+ *
+ * Revision 1.10  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.9  1999/08/27 09:40:32  adam
+ * Renamed logf function to yaz_log. Removed VC++ project files.
+ *
+ * Revision 1.8  1998/10/13 16:09:54  adam
  * Added support for arbitrary OID's for tagsets, schemas and attribute sets.
  * Added support for multiple attribute set references and tagset references
  * from an abstract syntax file.
@@ -40,10 +49,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <oid.h>
-#include <log.h>
-
-#include <data1.h>
+#include <yaz/oid.h>
+#include <yaz/log.h>
+#include <yaz/data1.h>
 
 data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
                                     char *zclass, char *type)
@@ -57,11 +65,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;
-           logf(LOG_WARN, "Unknown variant type %s in class %s",
-                type, zclass);
+           yaz_log(LOG_WARN, "Unknown variant type %s in class %s",
+                   type, zclass);
            return 0;
        }
-    logf(LOG_WARN, "Unknown variant class %s", zclass);
+    yaz_log(LOG_WARN, "Unknown variant class %s", zclass);
     return 0;
 }
 
@@ -80,9 +88,9 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
     res->reference = VAL_NONE;
     res->classes = 0;
 
-    if (!(f = yaz_path_fopen(data1_get_tabpath(dh), file, "r")))
+    if (!(f = data1_path_fopen(dh, file, "r")))
     {
-       logf(LOG_WARN|LOG_ERRNO, "%s", file);
+       yaz_log(LOG_WARN|LOG_ERRNO, "%s", file);
        return 0;
     }
     while ((argc = readconf_line(f, &lineno, line, 512, argv, 50)))
@@ -92,8 +100,8 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
            
            if (argc != 3)
            {
-               logf(LOG_WARN, "%s:%d: Bad # or args to class",
-                    file, lineno);
+               yaz_log(LOG_WARN, "%s:%d: Bad # or args to class",
+                       file, lineno);
                continue;
            }
            *classp = r = zclass = (data1_varclass *)
@@ -112,13 +120,14 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
 
            if (!typep)
            {
-               logf(LOG_WARN, "%s:%d: Directive class must precede type",
-                    file, lineno);
+               yaz_log(LOG_WARN, "%s:%d: Directive class must precede type",
+                       file, lineno);
                continue;
            }
            if (argc != 4)
            {
-               logf(LOG_WARN, "%s:%d: Bad # or args to type", file, lineno);
+               yaz_log(LOG_WARN, "%s:%d: Bad # or args to type",
+                       file, lineno);
                continue;
            }
            *typep = r = (data1_vartype *)nmem_malloc(mem, sizeof(*r));
@@ -127,8 +136,8 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
            r->type = atoi(argv[1]);
            if (!(r->datatype = data1_maptype (dh, argv[3])))
            {
-               logf(LOG_WARN, "%s:%d: Unknown datatype '%s'",
-                    file, lineno, argv[3]);
+               yaz_log(LOG_WARN, "%s:%d: Unknown datatype '%s'",
+                       file, lineno, argv[3]);
                fclose(f);
                return 0;
            }
@@ -139,8 +148,8 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
        {
            if (argc != 2)
            {
-               logf(LOG_WARN, "%s:%d: Bad # args for name",
-                    file, lineno);
+               yaz_log(LOG_WARN, "%s:%d: Bad # args for name",
+                       file, lineno);
                continue;
            }
            res->name = nmem_strdup(mem, argv[1]);
@@ -149,20 +158,20 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
        {
            if (argc != 2)
            {
-               logf(LOG_WARN, "%s:%d: Bad # args for reference",
-                    file, lineno);
+               yaz_log(LOG_WARN, "%s:%d: Bad # args for reference",
+                       file, lineno);
                continue;
            }
            if ((res->reference = oid_getvalbyname(argv[1])) == VAL_NONE)
            {
-               logf(LOG_WARN, "%s:%d: Unknown reference '%s'",
-                    file, lineno, argv[1]);
+               yaz_log(LOG_WARN, "%s:%d: Unknown reference '%s'",
+                       file, lineno, argv[1]);
                continue;
            }
        }
        else 
-           logf(LOG_WARN, "%s:%d: Unknown directive '%s'",
-                file, lineno, argv[0]);
+           yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+                   file, lineno, argv[0]);
     
     fclose(f);
     return res;