X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_varset.c;h=adf3e2e54ad5db8988cea66ea7f58d6ef73ead51;hp=ced2c2601da0bb74ced89640bd8f6a519a1686f7;hb=576bbdac86159c56e0f609177a355e59e7cfc3a8;hpb=6517fa53d35512887780fd07de5667940da18a9e

diff --git a/retrieval/d1_varset.c b/retrieval/d1_varset.c
index ced2c26..adf3e2e 100644
--- a/retrieval/d1_varset.c
+++ b/retrieval/d1_varset.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_varset.c,v $
- * Revision 1.6  1997-09-17 12:10:39  adam
+ * 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
  * YAZ version 1.4.
  *
  * Revision 1.5  1997/09/05 09:50:58  adam
@@ -28,11 +40,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <readconf.h>
 #include <oid.h>
 #include <log.h>
 
-#include <tpath.h>
 #include <data1.h>
 
 data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
@@ -47,7 +57,8 @@ 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);
+	    logf(LOG_WARN, "Unknown variant type %s in class %s",
+		 type, zclass);
 	    return 0;
 	}
     logf(LOG_WARN, "Unknown variant class %s", zclass);
@@ -57,10 +68,11 @@ data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
 data1_varset *data1_read_varset (data1_handle dh, const char *file)
 {
     NMEM mem = data1_nmem_get (dh);
-    data1_varset *res = nmem_malloc(mem, sizeof(*res));
+    data1_varset *res = (data1_varset *)nmem_malloc(mem, sizeof(*res));
     data1_varclass **classp = &res->classes, *zclass = 0;
     data1_vartype **typep = 0;
     FILE *f;
+    int lineno = 0;
     int argc;
     char *argv[50],line[512];
 
@@ -73,18 +85,19 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
 	logf(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;
+		logf(LOG_WARN, "%s:%d: Bad # or args to class",
+		     file, lineno);
+		continue;
 	    }
-	    *classp = r = zclass = 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]);
@@ -99,23 +112,23 @@ 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;
+		logf(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;
+		logf(LOG_WARN, "%s:%d: Bad # or args to type", file, lineno);
+		continue;
 	    }
-	    *typep = r = nmem_malloc(mem, sizeof(*r));
+	    *typep = r = (data1_vartype *)nmem_malloc(mem, sizeof(*r));
 	    r->name = nmem_strdup(mem, argv[2]);
 	    r->zclass = zclass;
 	    r->type = atoi(argv[1]);
 	    if (!(r->datatype = data1_maptype (dh, argv[3])))
 	    {
-		logf(LOG_WARN, "%s: Unknown datatype '%s'", file, argv[3]);
+		logf(LOG_WARN, "%s:%d: Unknown datatype '%s'",
+		     file, lineno, argv[3]);
 		fclose(f);
 		return 0;
 	    }
@@ -126,9 +139,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;
+		logf(LOG_WARN, "%s:%d: Bad # args for name",
+		     file, lineno);
+		continue;
 	    }
 	    res->name = nmem_strdup(mem, argv[1]);
 	}
@@ -136,21 +149,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;
+		logf(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;
+		logf(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);
-
+	    logf(LOG_WARN, "%s:%d: Unknown directive '%s'",
+		 file, lineno, argv[0]);
+    
     fclose(f);
     return res;
 }