X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_grs.c;h=e295a25dc2928503ba5d1712d57136eee025ab0c;hb=e63cb633d580e1a364de81d4f24fb2c9fa70e279;hp=b09be776818c80d81a60cfe6306beb0c4705720e;hpb=996d52d71822d0599763e05254901161798c3a3c;p=idzebra-moved-to-github.git

diff --git a/data1/d1_grs.c b/data1/d1_grs.c
index b09be77..e295a25 100644
--- a/data1/d1_grs.c
+++ b/data1/d1_grs.c
@@ -1,6 +1,6 @@
-/* $Id: d1_grs.c,v 1.3 2003-03-27 21:57:01 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: d1_grs.c,v 1.7 2005-01-15 19:38:18 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -27,7 +27,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <yaz/proto.h>
 #include <yaz/log.h>
-#include <data1.h>
+#include <d1_absyn.h>
 
 #define D1_VARIANTARRAY 20 /* fixed max length on sup'd variant-list. Lazy me */
 
@@ -94,7 +94,7 @@ static Z_Variant *make_variant(data1_node *n, int num, ODR o)
                     odr_strdup(o, p->u.variant.value);
 		break;
 	    default:
-		yaz_log(LOG_WARN, "Unable to handle value for variant %s",
+		yaz_log(YLOG_WARN, "Unable to handle value for variant %s",
 			p->u.variant.type->name);
 		return 0;
 	}
@@ -118,7 +118,7 @@ static int traverse_triples(data1_node *n, int level, Z_ElementMetaData *m,
 		    D1_VARIANTARRAY);
 	    else if (m->num_supportedVariants >= D1_VARIANTARRAY)
 	    {
-		yaz_log(LOG_WARN, "Too many variants (D1_VARIANTARRAY==%d)",
+		yaz_log(YLOG_WARN, "Too many variants (D1_VARIANTARRAY==%d)",
 			D1_VARIANTARRAY);
 		return -1;
 	    }
@@ -218,7 +218,7 @@ static Z_ElementData *nodetoelementdata(data1_handle dh, data1_node *n,
             *len += oid_oidlen(res->u.oid) * sizeof(int);
             break;
         default:
-            yaz_log(LOG_WARN, "Can't handle datatype.");
+            yaz_log(YLOG_WARN, "Can't handle datatype.");
             return 0;
 	}
     }
@@ -294,7 +294,7 @@ static Z_TaggedElement *nodetotaggedelement(data1_handle dh, data1_node *n,
     }
     else
     {
-	yaz_log(LOG_WARN, "Bad data.");
+	yaz_log(YLOG_WARN, "Bad data.");
 	return 0;
     }
 
@@ -392,7 +392,7 @@ Z_GenericRecord *data1_nodetogr(data1_handle dh, data1_node *n,
           data1_gettagbyname (dh, n->root->u.root.absyn->tagset,
                               "wellKnown")))
     {
-        yaz_log(LOG_WARN, "Unable to locate tag for 'wellKnown'");
+        yaz_log(YLOG_WARN, "Unable to locate tag for 'wellKnown'");
         wellknown_tag = odr_malloc(o, sizeof(*wellknown_tag));
         wellknown_tag->which = DATA1T_numeric;
         wellknown_tag->value.numeric = 19;