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

diff --git a/retrieval/d1_varset.c b/retrieval/d1_varset.c
index 2d20727..ced2c26 100644
--- a/retrieval/d1_varset.c
+++ b/retrieval/d1_varset.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_varset.c,v $
- * Revision 1.1  1995-11-01 11:56:09  quinn
+ * Revision 1.6  1997-09-17 12:10:39  adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.5  1997/09/05 09:50:58  adam
+ * Removed global data1_tabpath - uses data1_get_tabpath() instead.
+ *
+ * Revision 1.4  1997/05/14 06:54:04  adam
+ * C++ support.
+ *
+ * Revision 1.3  1995/11/01 16:34:58  quinn
+ * Making data1 look for tables in data1_tabpath
+ *
+ * Revision 1.2  1995/11/01  13:54:50  quinn
+ * Minor adjustments
+ *
+ * Revision 1.1  1995/11/01  11:56:09  quinn
  * Added Retrieval (data management) functions en masse.
  *
  *
@@ -15,33 +30,35 @@
 
 #include <readconf.h>
 #include <oid.h>
-#include <alexutil.h>
 #include <log.h>
 
-#include "data1.h"
+#include <tpath.h>
+#include <data1.h>
 
-data1_vartype *data1_getvartypebyct(data1_varset *set, char *class, char *type)
+data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
+				     char *zclass, char *type)
 {
     data1_varclass *c;
     data1_vartype *t;
 
     for (c = set->classes; c; c = c->next)
-	if (!data1_matchstr(c->name, class))
+	if (!data1_matchstr(c->name, zclass))
 	{
 	    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, class);
+	    logf(LOG_WARN, "Unknown variant type %s in class %s", type, zclass);
 	    return 0;
 	}
-    logf(LOG_WARN, "Unknown variant class %s", class);
+    logf(LOG_WARN, "Unknown variant class %s", zclass);
     return 0;
 }
 
-data1_varset *data1_read_varset(char *file)
+data1_varset *data1_read_varset (data1_handle dh, const char *file)
 {
-    data1_varset *res = xmalloc(sizeof(*res));
-    data1_varclass **classp = &res->classes, *class = 0;
+    NMEM mem = data1_nmem_get (dh);
+    data1_varset *res = nmem_malloc(mem, sizeof(*res));
+    data1_varclass **classp = &res->classes, *zclass = 0;
     data1_vartype **typep = 0;
     FILE *f;
     int argc;
@@ -51,7 +68,7 @@ data1_varset *data1_read_varset(char *file)
     res->reference = VAL_NONE;
     res->classes = 0;
 
-    if (!(f = fopen(file, "r")))
+    if (!(f = yaz_path_fopen(data1_get_tabpath(dh), file, "r")))
     {
 	logf(LOG_WARN|LOG_ERRNO, "%s", file);
 	return 0;
@@ -67,11 +84,10 @@ data1_varset *data1_read_varset(char *file)
 		fclose(f);
 		return 0;
 	    }
-	    *classp = r = class = xmalloc(sizeof(*r));
+	    *classp = r = zclass = nmem_malloc(mem, sizeof(*r));
 	    r->set = res;
-	    r->class = atoi(argv[1]);
-	    r->name = xmalloc(strlen(argv[2])+1);
-	    strcpy(r->name, argv[2]);
+	    r->zclass = atoi(argv[1]);
+	    r->name = nmem_strdup(mem, argv[2]);
 	    r->types = 0;
 	    typep = &r->types;
 	    r->next = 0;
@@ -93,12 +109,11 @@ data1_varset *data1_read_varset(char *file)
 		fclose(f);
 		return 0;
 	    }
-	    *typep = r = xmalloc(sizeof(*r));
-	    r->name = xmalloc(strlen(argv[2])+1);
-	    strcpy(r->name, argv[2]);
-	    r->class = class;
+	    *typep = r = 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(argv[3])))
+	    if (!(r->datatype = data1_maptype (dh, argv[3])))
 	    {
 		logf(LOG_WARN, "%s: Unknown datatype '%s'", file, argv[3]);
 		fclose(f);
@@ -115,8 +130,7 @@ data1_varset *data1_read_varset(char *file)
 		fclose(f);
 		return 0;
 	    }
-	    res->name = xmalloc(strlen(argv[1])+1);
-	    strcpy(res->name, argv[1]);
+	    res->name = nmem_strdup(mem, argv[1]);
 	}
 	else if (!strcmp(argv[0], "reference"))
 	{