X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_tagset.c;h=4ecb002836d6334123ed7e8f7f6c94b24ef9ae4c;hp=8b1ada62d4fc6e6779aed60d5dbbad52805f1315;hb=a66b7d79383ae700f3358731eecfe2aafed0e90d;hpb=519fefb91135ad52134b9fc4e82b3874f5525a2b

diff --git a/data1/d1_tagset.c b/data1/d1_tagset.c
index 8b1ada6..4ecb002 100644
--- a/data1/d1_tagset.c
+++ b/data1/d1_tagset.c
@@ -1,17 +1,29 @@
-/*
- * Copyright (c) 1995-2002, Index Data.
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: d1_tagset.c,v 1.1 2002-10-22 12:53:33 adam Exp $
- */
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2010 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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <yaz/log.h>
-#include <data1.h>
+#include <idzebra/data1.h>
+#include <yaz/oid_db.h>
 
 /*
  * We'll probably want to add some sort of hashed index to these lookup-
@@ -94,7 +106,7 @@ data1_tagset *data1_empty_tagset (data1_handle dh)
     data1_tagset *res =
 	(data1_tagset *) nmem_malloc(data1_nmem_get (dh), sizeof(*res));
     res->name = 0;
-    res->reference = VAL_NONE;
+    res->oid = 0;
     res->tags = 0;
     res->type = 0;
     res->children = 0;
@@ -115,7 +127,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 
     if (!(f = data1_path_fopen(dh, file, "r")))
     {
-	yaz_log(LOG_WARN|LOG_ERRNO, "%s", file);
+	yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", file);
 	return 0;
     }
     res = data1_empty_tagset (dh);
@@ -135,7 +147,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 
 	    if (argc != 4)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # args to tag", file, lineno);
+		yaz_log(YLOG_WARN, "%s:%d: Bad # args to tag", file, lineno);
 		continue;
 	    }
 	    value = atoi(argv[1]);
@@ -153,7 +165,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 
 	    if (!(rr->kind = data1_maptype(dh, type)))
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Unknown datatype %s",
+		yaz_log(YLOG_WARN, "%s:%d: Unknown datatype %s",
 		     file, lineno, type);
 		fclose(f);
 		return 0;
@@ -181,7 +193,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 	{
 	    if (argc != 2)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # args to name", file, lineno);
+		yaz_log(YLOG_WARN, "%s:%d: Bad # args to name", file, lineno);
 		continue;
 	    }
 	    res->name = nmem_strdup(mem, argv[1]);
@@ -192,14 +204,16 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 	    
 	    if (argc != 2)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # args to reference",
+		yaz_log(YLOG_WARN, "%s:%d: Bad # args to reference",
 			file, lineno);
 		continue;
 	    }
 	    name = argv[1];
-	    if ((res->reference = oid_getvalbyname(name)) == VAL_NONE)
+            res->oid = yaz_string_to_oid_nmem(yaz_oid_std(),
+                                              CLASS_TAGSET, name, mem);
+	    if (!res->oid)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Unknown tagset ref '%s'",
+		yaz_log(YLOG_WARN, "%s:%d: Unknown tagset ref '%s'",
 			file, lineno, name);
 		continue;
 	    }
@@ -208,7 +222,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 	{
 	    if (argc != 2)
 	    {
-		yaz_log (LOG_WARN, "%s:%d: Bad # args to type", file, lineno);
+		yaz_log (YLOG_WARN, "%s:%d: Bad # args to type", file, lineno);
 		continue;
 	    }
 	    if (!res->type)
@@ -221,7 +235,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 
 	    if (argc < 2)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # args to include",
+		yaz_log(YLOG_WARN, "%s:%d: Bad # args to include",
 			file, lineno);
 		continue;
 	    }
@@ -231,7 +245,7 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 	    *childp = data1_read_tagset (dh, name, type);
 	    if (!(*childp))
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Inclusion failed for tagset %s",
+		yaz_log(YLOG_WARN, "%s:%d: Inclusion failed for tagset %s",
 			file, lineno, name);
 		continue;
 	    }
@@ -239,10 +253,19 @@ data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
 	}
 	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
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+