X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_varset.c;h=843b271df23f9fb1c167afb262c585a5c6577b8e;hb=e4e44d1916c6e80e01aad163b487ee41c22272ba;hp=4369cd8fdc0f3f8323bd420d0b9d40bfe5ab7a0a;hpb=02266b68e2e2c86d8a8467ee56721926b365d2d0;p=idzebra-moved-to-github.git

diff --git a/data1/d1_varset.c b/data1/d1_varset.c
index 4369cd8..843b271 100644
--- a/data1/d1_varset.c
+++ b/data1/d1_varset.c
@@ -1,8 +1,5 @@
-/* $Id: d1_varset.c,v 1.2 2002-10-22 13:19:50 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   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,20 +12,23 @@ 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 <string.h>
 #include <stdlib.h>
 
-#include <yaz/oid.h>
+#include <yaz/oid_db.h>
 #include <yaz/log.h>
-#include <data1.h>
+#include <d1_absyn.h>
 
 data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
-				     char *zclass, char *type)
+				     const char *zclass, const char *type)
 {
     data1_varclass *c;
     data1_vartype *t;
@@ -39,14 +39,20 @@ data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
 	    for (t = c->types; t; t = t->next)
 		if (!data1_matchstr(t->name, type))
 		    return t;
-	    yaz_log(LOG_WARN, "Unknown variant type %s in class %s",
+	    yaz_log(YLOG_WARN, "Unknown variant type %s in class %s",
 		    type, zclass);
 	    return 0;
 	}
-    yaz_log(LOG_WARN, "Unknown variant class %s", zclass);
+    yaz_log(YLOG_WARN, "Unknown variant class %s", zclass);
     return 0;
 }
 
+data1_vartype *data1_getvartypeby_absyn (data1_handle dh, data1_absyn *absyn,
+					   char *zclass, char *type)
+{
+    return data1_getvartypebyct(dh, absyn->varset, zclass, type);
+}
+
 data1_varset *data1_read_varset (data1_handle dh, const char *file)
 {
     NMEM mem = data1_nmem_get (dh);
@@ -59,12 +65,12 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
     char *argv[50],line[512];
 
     res->name = 0;
-    res->reference = VAL_NONE;
+    res->oid = 0;
     res->classes = 0;
 
     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;
     }
     while ((argc = readconf_line(f, &lineno, line, 512, argv, 50)))
@@ -74,7 +80,7 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
 	    
 	    if (argc != 3)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # or args to class",
+		yaz_log(YLOG_WARN, "%s:%d: Bad # or args to class",
 			file, lineno);
 		continue;
 	    }
@@ -94,13 +100,13 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
 
 	    if (!typep)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Directive class must precede type",
+		yaz_log(YLOG_WARN, "%s:%d: Directive class must precede type",
 			file, lineno);
 		continue;
 	    }
 	    if (argc != 4)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # or args to type",
+		yaz_log(YLOG_WARN, "%s:%d: Bad # or args to type",
 			file, lineno);
 		continue;
 	    }
@@ -110,7 +116,7 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
 	    r->type = atoi(argv[1]);
 	    if (!(r->datatype = data1_maptype (dh, argv[3])))
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Unknown datatype '%s'",
+		yaz_log(YLOG_WARN, "%s:%d: Unknown datatype '%s'",
 			file, lineno, argv[3]);
 		fclose(f);
 		return 0;
@@ -122,7 +128,7 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
 	{
 	    if (argc != 2)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # args for name",
+		yaz_log(YLOG_WARN, "%s:%d: Bad # args for name",
 			file, lineno);
 		continue;
 	    }
@@ -132,21 +138,32 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file)
 	{
 	    if (argc != 2)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Bad # args for reference",
+		yaz_log(YLOG_WARN, "%s:%d: Bad # args for reference",
 			file, lineno);
 		continue;
 	    }
-	    if ((res->reference = oid_getvalbyname(argv[1])) == VAL_NONE)
+            res->oid = yaz_string_to_oid_nmem(yaz_oid_std(),
+                                              CLASS_VARSET, argv[1], mem);
+	    if (!res->oid)
 	    {
-		yaz_log(LOG_WARN, "%s:%d: Unknown reference '%s'",
+		yaz_log(YLOG_WARN, "%s:%d: Unknown reference '%s'",
 			file, lineno, argv[1]);
 		continue;
 	    }
 	}
 	else 
-	    yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+	    yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'",
 		    file, lineno, argv[0]);
     
     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
+ */
+