Remove local attribute handling and other dead code.

[idzebra-moved-to-github.git] / data1 / d1_attset.c

diff --git a/data1/d1_attset.c b/data1/d1_attset.c
index 2a3014a..17963e9 100644 (file)
--- a/data1/d1_attset.c
+++ b/data1/d1_attset.c
@@ -1,6 +1,6 @@
-/* $Id: d1_attset.c,v 1.3 2004-09-28 10:15:03 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: d1_attset.c,v 1.10 2006-05-19 23:45:28 adam Exp $
+   Copyright (C) 1995-2006
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -25,24 +25,23 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdlib.h>
 
 #include <yaz/log.h>
-#include <d1_attset.h>
 #include <idzebra/data1.h>
 
-data1_att *data1_getattbyname(data1_handle dh, data1_attset *s, char *name)
+data1_att *data1_getattbyname(data1_handle dh, data1_attset *s, const char *name)
 {
     data1_att *r;
     data1_attset_child *c;
     
     /* scan local set */
     for (r = s->atts; r; r = r->next)
-       if (!data1_matchstr(r->name, name))
-           return r;
+        if (!data1_matchstr(r->name, name))
+            return r;
     for (c = s->children; c; c = c->next)
     {
-       assert (c->child);
-       /* scan included sets */
-       if ((r = data1_getattbyname (dh, c->child, name)))
-           return r;
+        assert (c->child);
+        /* scan included sets */
+        if ((r = data1_getattbyname (dh, c->child, name)))
+            return r;
     }
     return 0;
 }
@@ -86,42 +85,24 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
            int num;
            char *name;
            data1_att *t;
-           data1_local_attribute *locals;
            
            if (argc < 3)
            {
-               yaz_log(LOG_WARN, "%s:%d: Bad # of args to att", file, lineno);
+               yaz_log(YLOG_WARN, "%s:%d: Bad # of args to att", file, lineno);
                continue;
            }
+            if (argc > 3)
+            {
+               yaz_log(YLOG_WARN, "%s:%d: Local attributes not supported",
+                        file, lineno);
+           }
            num = atoi (argv[1]);
            name = argv[2];
            
-           if (argc == 3) /* no local attributes given */
-           {
-               locals = (data1_local_attribute *)
-                   nmem_malloc(mem, sizeof(*locals));
-               locals->local = num;
-               locals->next = 0;
-           }
-           else /* parse the string "local{,local}" */
-           {
-               char *p = argv[3];
-               data1_local_attribute **ap = &locals;
-               do
-               {
-                   *ap = (data1_local_attribute *)
-                       nmem_malloc(mem, sizeof(**ap));
-                   (*ap)->local = atoi(p);
-                   (*ap)->next = 0;
-                   ap = &(*ap)->next;
-               }
-               while ((p = strchr(p, ',')) && *(++p));
-           }
            t = *attp = (data1_att *)nmem_malloc(mem, sizeof(*t));
            t->parent = res;
            t->name = nmem_strdup(mem, name);
            t->value = num;
-           t->locals = locals;
            t->next = 0;
            attp = &t->next;
        }
@@ -129,7 +110,7 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
        {
            if (argc != 2)
            {
-               yaz_log(LOG_WARN, "%s:%d: Bad # of args to name", file, lineno);
+               yaz_log(YLOG_WARN, "%s:%d: Bad # of args to name", file, lineno);
                continue;
            }
        }
@@ -139,14 +120,14 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
 
            if (argc != 2)
            {
-               yaz_log(LOG_WARN, "%s:%d: Bad # of args to reference",
+               yaz_log(YLOG_WARN, "%s:%d: Bad # of args to reference",
                        file, lineno);
                continue;
            }
            name = argv[1];
            if ((res->reference = oid_getvalbyname(name)) == VAL_NONE)
            {
-               yaz_log(LOG_WARN, "%s:%d: Unknown reference oid '%s'",
+               yaz_log(YLOG_WARN, "%s:%d: Unknown reference oid '%s'",
                        file, lineno, name);
                fclose(f);
                return 0;
@@ -154,7 +135,7 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
        }
        else if (!strcmp(cmd, "ordinal"))
        {
-           yaz_log (LOG_WARN, "%s:%d: Directive ordinal ignored",
+           yaz_log (YLOG_WARN, "%s:%d: Directive ordinal ignored",
                     file, lineno);
        }
        else if (!strcmp(cmd, "include"))
@@ -164,7 +145,7 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
 
            if (argc != 2)
            {
-               yaz_log(LOG_WARN, "%s:%d: Bad # of args to include",
+               yaz_log(YLOG_WARN, "%s:%d: Bad # of args to include",
                        file, lineno);
                continue;
            }
@@ -172,7 +153,7 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
 
            if (!(attset = data1_get_attset (dh, name)))
            {
-               yaz_log(LOG_WARN, "%s:%d: Include of attset %s failed",
+               yaz_log(YLOG_WARN, "%s:%d: Include of attset %s failed",
                        file, lineno, name);
                continue;
                
@@ -185,10 +166,18 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
        }
        else
        {
-           yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+           yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'",
                    file, lineno, cmd);
        }
     }
     fclose(f);
     return res;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+