Support use of local tag names in abs file.

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

diff --git a/retrieval/d1_absyn.c b/retrieval/d1_absyn.c
index 1322132..349821d 100644 (file)
--- a/retrieval/d1_absyn.c
+++ b/retrieval/d1_absyn.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_absyn.c,v $
- * Revision 1.2  1995-11-01 13:54:44  quinn
+ * Revision 1.4  1996-05-01 12:45:28  quinn
+ * Support use of local tag names in abs file.
+ *
+ * Revision 1.3  1995/11/01  16:34:55  quinn
+ * Making data1 look for tables in data1_tabpath
+ *
+ * Revision 1.2  1995/11/01  13:54:44  quinn
  * Minor adjustments
  *
  * Revision 1.1  1995/11/01  11:56:06  quinn
@@ -22,6 +28,7 @@
 #include <xmalloc.h>
 #include <oid.h>
 #include <log.h>
+#include <tpath.h>
 
 #include <data1.h>
 
@@ -109,7 +116,7 @@ data1_absyn *data1_read_absyn(char *file)
     data1_marctab **marcp;
     int level = 0;
 
-    if (!(f = fopen(file, "r")))
+    if (!(f = yaz_path_fopen(data1_tabpath, file, "r")))
     {
        logf(LOG_WARN|LOG_ERRNO, "%s", file);
        return 0;
@@ -180,29 +187,47 @@ data1_absyn *data1_read_absyn(char *file)
            level = i;
            if (!(new = *ppl[level] = xmalloc(sizeof(*new))))
                abort;
-           new ->next = new->children = 0;
+           new->next = new->children = 0;
+           new->tag = 0;
+           new->att = 0;
            ppl[level] = &new->next;
            ppl[level+1] = &new->children;
 
-           if (sscanf(p, "(%d,%d)", &type, &value) < 2)
+           /* well-defined tag */
+           if (sscanf(p, "(%d,%d)", &type, &value) == 2)
            {
-               logf(LOG_WARN, "Malformed element '%s' in %s", p, file);
-               fclose(f);
-               return 0;
+               if (!res->tagset)
+               {
+                   logf(LOG_WARN, "No tagset loaded in %s", file);
+                   fclose(f);
+                   return 0;
+               }
+               if (!(new->tag = data1_gettagbynum(res->tagset, type, value)))
+               {
+                   logf(LOG_WARN, "Couldn't find tag %s in tagset in %s",
+                       p, file);
+                   fclose(f);
+                   return 0;
+               }
            }
-           if (!res->tagset)
+           /* private tag */
+           else if (*p)
            {
-               logf(LOG_WARN, "No tagset loaded in %s", file);
-               fclose(f);
-               return 0;
+               data1_tag *nt = new->tag = xmalloc(sizeof(*new->tag));
+               nt->which = DATA1T_string;
+               nt->value.string = xstrdup(p);
+               nt->names = xmalloc(sizeof(*new->tag->names));
+               nt->names->name = nt->value.string;
+               nt->names->next = 0;
+               nt->kind = DATA1K_string;
            }
-           if (!(new->tag = data1_gettagbynum(res->tagset, type, value)))
+           else
            {
-               logf(LOG_WARN, "Couldn't find tag %s in tagset in %s",
-                   p, file);
+               logf(LOG_WARN, "Bad element is %s", file);
                fclose(f);
                return 0;
            }
+
            if (*att == '!')
                strcpy(att, name);
            if (*att == '-')