Deb: idzebra-2.0-utils includes init.d script

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

diff --git a/data1/d1_attset.c b/data1/d1_attset.c
index fe948b0..b2ddc6b 100644 (file)
--- a/data1/d1_attset.c
+++ b/data1/d1_attset.c
@@ -1,8 +1,5 @@
-/* $Id: d1_attset.c,v 1.12 2006-08-23 13:56:07 adam Exp $
-   Copyright (C) 1995-2006
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 2004-2013 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -20,18 +17,22 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 
 #include <yaz/log.h>
+#include <yaz/oid_db.h>
 #include <idzebra/data1.h>
 
 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))
@@ -52,7 +53,7 @@ data1_attset *data1_empty_attset(data1_handle dh)
     data1_attset *res = (data1_attset*) nmem_malloc(mem,sizeof(*res));
 
     res->name = 0;
-    res->reference = VAL_NONE;
+    res->oid = 0;
     res->atts = 0;
     res->children = 0;
     res->next = 0;
@@ -86,7 +87,7 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
            char *name;
             char *endptr;
            data1_att *t;
-           
+
            if (argc < 3)
            {
                yaz_log(YLOG_WARN, "%s:%d: Bad # of args to att", file, lineno);
@@ -105,7 +106,7 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
                continue;
             }
            name = argv[2];
-           
+
            t = *attp = (data1_att *)nmem_malloc(mem, sizeof(*t));
            t->parent = res;
            t->name = nmem_strdup(mem, name);
@@ -132,7 +133,10 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
                continue;
            }
            name = argv[1];
-           if ((res->reference = oid_getvalbyname(name)) == VAL_NONE)
+
+            res->oid  = yaz_string_to_oid_nmem(yaz_oid_std(),
+                                               CLASS_ATTSET, name, mem);
+           if (!res->oid)
            {
                yaz_log(YLOG_WARN, "%s:%d: Unknown reference oid '%s'",
                        file, lineno, name);
@@ -163,7 +167,7 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
                yaz_log(YLOG_WARN, "%s:%d: Include of attset %s failed",
                        file, lineno, name);
                continue;
-               
+
            }
            *childp = (data1_attset_child *)
                nmem_malloc (mem, sizeof(**childp));
@@ -183,6 +187,7 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab