Renamed logf function to yaz_log. Removed VC++ project files.

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

diff --git a/retrieval/d1_tagset.c b/retrieval/d1_tagset.c
index 38b785f..65b9daa 100644 (file)
--- a/retrieval/d1_tagset.c
+++ b/retrieval/d1_tagset.c
@@ -1,10 +1,20 @@
 /*
- * 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.9  1998-10-13 16:09:53  adam
+ * 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.
+ *
+ * Revision 1.9  1998/10/13 16:09:53  adam
  * Added support for arbitrary OID's for tagsets, schemas and attribute sets.
  * Added support for multiple attribute set references and tagset references
  * from an abstract syntax file.
@@ -80,14 +90,14 @@ data1_datatype data1_maptype (data1_handle dh, char *t)
     for (i = 0; types[i].tname; i++)
        if (!data1_matchstr(types[i].tname, t))
            return types[i].type;
-    return 0;
+    return DATA1K_unknown;
 }
 
 data1_tag *data1_gettagbynum (data1_handle dh, data1_tagset *s,
                              int type, int value)
 {
     data1_tag *r;
-
+    
     for (; s; s = s->next)
     {
        /* scan local set */
@@ -96,14 +106,15 @@ data1_tag *data1_gettagbynum (data1_handle dh, data1_tagset *s,
                if (r->which == DATA1T_numeric && r->value.numeric == value)
                    return r;
        /* scan included sets */
-       if (s->children && (r = data1_gettagbynum (dh, s->children,
-                                                  type, value)))
+       if (s->children &&
+           (r = data1_gettagbynum (dh, s->children, type, value)))
            return r;
     }
     return 0;
 }
 
-data1_tag *data1_gettagbyname (data1_handle dh, data1_tagset *s, char *name)
+data1_tag *data1_gettagbyname (data1_handle dh, data1_tagset *s,
+                              const char *name)
 {
     data1_tag *r;
 
@@ -131,17 +142,18 @@ data1_tagset *data1_empty_tagset (data1_handle dh)
        (data1_tagset *) nmem_malloc(data1_nmem_get (dh), sizeof(*res));
     res->name = 0;
     res->reference = VAL_NONE;
-    res->type = 0;
     res->tags = 0;
+    res->type = 0;
     res->children = 0;
     res->next = 0;
     return res;
 }
 
-data1_tagset *data1_read_tagset (data1_handle dh, char *file)
+data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 {
     NMEM mem = data1_nmem_get (dh);
-    data1_tagset *res = 0, **childp;
+    data1_tagset *res = 0;
+    data1_tagset **childp;
     data1_tag **tagp;
     FILE *f;
     int lineno = 0;
@@ -150,10 +162,11 @@ data1_tagset *data1_read_tagset (data1_handle dh, char *file)
 
     if (!(f = yaz_path_fopen(data1_get_tabpath(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);
+    res->type = type;
     childp = &res->children;
     tagp = &res->tags;
 
@@ -169,7 +182,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, char *file)
 
            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]);
@@ -187,7 +200,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, char *file)
 
            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;
@@ -215,7 +228,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, char *file)
        {
            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]);
@@ -226,14 +239,15 @@ data1_tagset *data1_read_tagset (data1_handle dh, char *file)
            
            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;
            }
        }
@@ -241,34 +255,39 @@ data1_tagset *data1_read_tagset (data1_handle dh, char *file)
        {
            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;
            }
-           res->type = atoi(argv[1]);
+           if (!res->type)
+               res->type = atoi(argv[1]);
        }
        else if (!strcmp(cmd, "include"))
        {
            char *name;
+           int type = 0;
 
-           if (argc != 2)
+           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];
-           if (!(*childp = data1_read_tagset (dh, name)))
+           if (argc == 3)
+               type = atoi(argv[2]);
+           *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);