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 b43c069..dbd1321 100644 (file)
--- a/retrieval/d1_varset.c
+++ b/retrieval/d1_varset.c
@@ -1,10 +1,28 @@
 /*
- * Copyright (c) 1995-1997, 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.7  1998-02-11 11:53:35  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.
+ * Fixed many bad logs-calls in routines that read the various
+ * specifications regarding data1 (*.abs,*.att,...) and made the messages
+ * consistent whenever possible.
+ * Added extra 'lineno' argument to function readconf_line.
+ *
+ * Revision 1.7  1998/02/11 11:53:35  adam
  * Changed code so that it compiles as C++.
  *
  * Revision 1.6  1997/09/17 12:10:39  adam
@@ -31,12 +49,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <readconf.h>
-#include <oid.h>
-#include <log.h>
-
-#include <tpath.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)
@@ -50,10 +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;
 }
 
@@ -64,6 +80,7 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
     data1_varclass **classp = &res->classes, *zclass = 0;
     data1_vartype **typep = 0;
     FILE *f;
+    int lineno = 0;
     int argc;
     char *argv[50],line[512];
 
@@ -71,23 +88,24 @@ 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, line, 512, argv, 50)))
+    while ((argc = readconf_line(f, &lineno, line, 512, argv, 50)))
        if (!strcmp(argv[0], "class"))
        {
            data1_varclass *r;
-
+           
            if (argc != 3)
            {
-               logf(LOG_FATAL, "%s: malformed class directive", file);
-               fclose(f);
-               return 0;
+               yaz_log(LOG_WARN, "%s:%d: Bad # or args to class",
+                       file, lineno);
+               continue;
            }
-           *classp = r = zclass = (data1_varclass *)nmem_malloc(mem, sizeof(*r));
+           *classp = r = zclass = (data1_varclass *)
+               nmem_malloc(mem, sizeof(*r));
            r->set = res;
            r->zclass = atoi(argv[1]);
            r->name = nmem_strdup(mem, argv[2]);
@@ -102,15 +120,15 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
 
            if (!typep)
            {
-               logf(LOG_WARN, "%s: class directive must precede type", file);
-               fclose(f);
-               return 0;
+               yaz_log(LOG_WARN, "%s:%d: Directive class must precede type",
+                       file, lineno);
+               continue;
            }
            if (argc != 4)
            {
-               logf(LOG_WARN, "%s: Malformed type directive", file);
-               fclose(f);
-               return 0;
+               yaz_log(LOG_WARN, "%s:%d: Bad # or args to type",
+                       file, lineno);
+               continue;
            }
            *typep = r = (data1_vartype *)nmem_malloc(mem, sizeof(*r));
            r->name = nmem_strdup(mem, argv[2]);
@@ -118,7 +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: Unknown datatype '%s'", file, argv[3]);
+               yaz_log(LOG_WARN, "%s:%d: Unknown datatype '%s'",
+                       file, lineno, argv[3]);
                fclose(f);
                return 0;
            }
@@ -129,9 +148,9 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
        {
            if (argc != 2)
            {
-               logf(LOG_WARN, "%s name: Expected 1 argument", file);
-               fclose(f);
-               return 0;
+               yaz_log(LOG_WARN, "%s:%d: Bad # args for name",
+                       file, lineno);
+               continue;
            }
            res->name = nmem_strdup(mem, argv[1]);
        }
@@ -139,21 +158,21 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
        {
            if (argc != 2)
            {
-               logf(LOG_WARN, "%s: reference: Expected 1 argument", file);
-               fclose(f);
-               return 0;
+               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, "Unknown reference '%s' in %s", argv[1], file);
-               fclose(f);
-               return 0;
+               yaz_log(LOG_WARN, "%s:%d: Unknown reference '%s'",
+                       file, lineno, argv[1]);
+               continue;
            }
        }
        else 
-           logf(LOG_WARN, "varset: Unknown directive '%s' in %s", argv[0],
-               file);
-
+           yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+                   file, lineno, argv[0]);
+    
     fclose(f);
     return res;
 }