*** empty log message ***

[yaz-moved-to-github.git] / retrieval / d1_attset.c

diff --git a/retrieval/d1_attset.c b/retrieval/d1_attset.c
index 44dec99..e179415 100644 (file)
--- a/retrieval/d1_attset.c
+++ b/retrieval/d1_attset.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_attset.c,v $
- * Revision 1.1  1995-11-01 11:56:07  quinn
+ * Revision 1.4  1996-02-21 15:23:36  quinn
+ * Reversed fclose and return;
+ *
+ * Revision 1.3  1995/12/13  17:14:26  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.2  1995/11/01  16:34:55  quinn
+ * Making data1 look for tables in data1_tabpath
+ *
+ * Revision 1.1  1995/11/01  11:56:07  quinn
  * Added Retrieval (data management) functions en masse.
  *
  *
@@ -18,6 +27,8 @@
 #include <xmalloc.h>
 #include <log.h>
 #include <d1_attset.h>
+#include <data1.h>
+#include <tpath.h>
 
 data1_att *data1_getattbyname(data1_attset *s, char *name)
 {
@@ -27,7 +38,7 @@ data1_att *data1_getattbyname(data1_attset *s, char *name)
     {
        /* scan local set */
        for (r = s->atts; r; r = r->next)
-           if (!strcmp(r->name, name))
+           if (!data1_matchstr(r->name, name))
                return r;
        /* scan included sets */
        if (s->children && (r = data1_getattbyname(s->children, name)))
@@ -43,7 +54,7 @@ data1_attset *data1_read_attset(char *file)
     data1_att **attp;
     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;
@@ -70,8 +81,8 @@ data1_attset *data1_read_attset(char *file)
        }
        if (!r)
        {
-           return res;
            fclose(f);
+           return res;
        }
        if (sscanf(r, "%s %[^\n]", cmd, args) < 2)
            *args = '\0';