X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_attset.c;h=e745292aa308d422bc164560f7fb06018e200e4c;hp=40e1b0493152d911cddecd6ee747ea7d5e142f9e;hb=ba0720e26f508ba3396e232d2f82037c0e701698;hpb=6ba9698e88c0283e40fa5980a1a6b551fff2d597

diff --git a/data1/d1_attset.c b/data1/d1_attset.c
index 40e1b04..e745292 100644
--- a/data1/d1_attset.c
+++ b/data1/d1_attset.c
@@ -1,8 +1,5 @@
-/* $Id: d1_attset.c,v 1.9 2006-05-19 13:49:33 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) 1994-2011 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
@@ -15,16 +12,20 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+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)
@@ -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;
@@ -84,43 +85,32 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
 	{
 	    int num;
 	    char *name;
+            char *endptr;
 	    data1_att *t;
-	    data1_local_attribute *locals;
 	    
 	    if (argc < 3)
 	    {
 		yaz_log(YLOG_WARN, "%s:%d: Bad # of args to att", file, lineno);
 		continue;
 	    }
-	    num = atoi (argv[1]);
+            if (argc > 3)
+            {
+		yaz_log(YLOG_WARN, "%s:%d: Local attributes not supported",
+                        file, lineno);
+	    }
+            num = strtol(argv[1], &endptr, 10);
+            if (*endptr != '\0')
+            {
+		yaz_log(YLOG_WARN, "%s:%d: Bad attribute integer %s",
+                        file, lineno, argv[1]);
+		continue;
+            }
 	    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;
 	}
@@ -143,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);
@@ -194,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