X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_tagset.c;h=1abd9fe0aa55161b4f02494ed2790b74ea90a9a9;hb=5b690aebb8dc2d05cad8f668de8fd821a1c231fa;hp=7ba2a81e01d6a442d5e65d7fbce4a81a865338b5;hpb=21a7fea425de8b32ac71bbbb981e88e77e6a3428;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_tagset.c b/retrieval/d1_tagset.c
index 7ba2a81..1abd9fe 100644
--- a/retrieval/d1_tagset.c
+++ b/retrieval/d1_tagset.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (c) 1995-1998, Index Data.
+ * Copyright (c) 1995-1999, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_tagset.c,v $
- * Revision 1.10  1998-10-15 08:29:17  adam
+ * Revision 1.15  2002-04-04 20:49:46  adam
+ * New functions yaz_is_abspath, yaz_path_fopen_base
+ *
+ * Revision 1.14  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.13  1999/10/21 12:06:29  adam
+ * Retrieval module no longer uses ctype.h - functions.
+ *
+ * Revision 1.12  1999/08/27 09:40:32  adam
+ * Renamed logf function to yaz_log. Removed VC++ project files.
+ *
+ * Revision 1.11  1998/10/19 14:16:36  adam
+ * Fixed data1_gettagbyname. Bug introduced by previous revision.
+ *
+ * Revision 1.10  1998/10/15 08:29:17  adam
  * Tag set type may be specified in reference to it using "tagset"
  * directive in .abs-files and "include" directive in .tag-files.
  *
@@ -48,11 +63,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 #include <string.h>
 
-#include <log.h>
-#include <data1.h>
+#include <yaz/log.h>
+#include <yaz/data1.h>
 
 /*
  * We'll probably want to add some sort of hashed index to these lookup-
@@ -115,7 +129,7 @@ data1_tag *data1_gettagbyname (data1_handle dh, data1_tagset *s,
     for (; s; s = s->next)
     {
 	/* scan local set */
-	for (r = s->children->tags; r; r = r->next)
+	for (r = s->tags; r; r = r->next)
 	{
 	    data1_name *np;
 
@@ -154,9 +168,9 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
     int argc;
     char *argv[50], line[512];
 
-    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;
     }
     res = data1_empty_tagset (dh);
@@ -176,7 +190,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 
 	    if (argc != 4)
 	    {
-		logf(LOG_WARN, "%s:%d: Bad # args to tag", file, lineno);
+		yaz_log(LOG_WARN, "%s:%d: Bad # args to tag", file, lineno);
 		continue;
 	    }
 	    value = atoi(argv[1]);
@@ -194,7 +208,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 
 	    if (!(rr->kind = data1_maptype(dh, type)))
 	    {
-		logf(LOG_WARN, "%s:%d: Unknown datatype %s",
+		yaz_log(LOG_WARN, "%s:%d: Unknown datatype %s",
 		     file, lineno, type);
 		fclose(f);
 		return 0;
@@ -222,7 +236,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 	{
 	    if (argc != 2)
 	    {
-		logf(LOG_WARN, "%s:%d: Bad # args to name", file, lineno);
+		yaz_log(LOG_WARN, "%s:%d: Bad # args to name", file, lineno);
 		continue;
 	    }
 	    res->name = nmem_strdup(mem, argv[1]);
@@ -233,14 +247,15 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 	    
 	    if (argc != 2)
 	    {
-		logf(LOG_WARN, "%s:%d: Bad # args to reference", file, lineno);
+		yaz_log(LOG_WARN, "%s:%d: Bad # args to reference",
+			file, lineno);
 		continue;
 	    }
 	    name = argv[1];
 	    if ((res->reference = oid_getvalbyname(name)) == VAL_NONE)
 	    {
-		logf(LOG_WARN, "%s:%d: Unknown tagset ref '%s'",
-		     file, lineno, name);
+		yaz_log(LOG_WARN, "%s:%d: Unknown tagset ref '%s'",
+			file, lineno, name);
 		continue;
 	    }
 	}
@@ -248,7 +263,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 	{
 	    if (argc != 2)
 	    {
-		logf (LOG_WARN, "%s:%d: Bad # args to type", file, lineno);
+		yaz_log (LOG_WARN, "%s:%d: Bad # args to type", file, lineno);
 		continue;
 	    }
 	    if (!res->type)
@@ -261,8 +276,8 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 
 	    if (argc < 2)
 	    {
-		logf(LOG_WARN, "%s:%d: Bad # args to include",
-		     file, lineno);
+		yaz_log(LOG_WARN, "%s:%d: Bad # args to include",
+			file, lineno);
 		continue;
 	    }
 	    name = argv[1];
@@ -271,16 +286,16 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 	    *childp = data1_read_tagset (dh, name, type);
 	    if (!(*childp))
 	    {
-		logf(LOG_WARN, "%s:%d: Inclusion failed for tagset %s",
-		     file, lineno, name);
+		yaz_log(LOG_WARN, "%s:%d: Inclusion failed for tagset %s",
+			file, lineno, name);
 		continue;
 	    }
 	    childp = &(*childp)->next;
 	}
 	else
 	{
-	    logf(LOG_WARN, "%s:%d: Unknown directive '%s'",
-		 file, lineno, cmd);
+	    yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+		    file, lineno, cmd);
 	}
     }
     fclose(f);