X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_tagset.c;h=97fdad8839165b75bd14378bc2e6765618a2d935;hb=cb914e4afd1e815bf47604efdfa964cee69557fa;hp=794315e524d91cdc8136a91d35c3b26b16c6ef5a;hpb=cea212fba995de3fa0d6d6723d828f6fd7ca31df;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_tagset.c b/retrieval/d1_tagset.c
index 794315e..97fdad8 100644
--- a/retrieval/d1_tagset.c
+++ b/retrieval/d1_tagset.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_tagset.c,v $
- * Revision 1.1  1995-11-01 11:56:09  quinn
+ * Revision 1.4  1995-11-13 09:27:38  quinn
+ * Fiddling with the variant stuff.
+ *
+ * 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:49  quinn
+ * Minor adjustments
+ *
+ * Revision 1.1  1995/11/01  11:56:09  quinn
  * Added Retrieval (data management) functions en masse.
  *
  *
@@ -17,8 +26,9 @@
 
 #include <xmalloc.h>
 #include <log.h>
+#include <tpath.h>
 
-#include "data1.h"
+#include <data1.h>
 
 /*
  * We'll probably want to add some sort of hashed index to these lookup-
@@ -42,6 +52,7 @@ data1_datatype data1_maptype(char *t)
 	{"intunit", DATA1K_intunit},
 	{"int", DATA1K_int},
 	{"octetstring", DATA1K_octetstring},
+	{"null", DATA1K_null},
 	{0, -1}
     };
     int i;
@@ -99,7 +110,7 @@ data1_tagset *data1_read_tagset(char *file)
     data1_tag **tagp;
     FILE *f;
 
-    if (!(f = fopen(file, "r")))
+    if (!(f = yaz_path_fopen(data1_tabpath, file, "r")))
     {
 	logf(LOG_WARN|LOG_ERRNO, "%s", file);
 	return 0;