X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_grs.c;h=6530e7f71c23528b7417ab5b196ee07a281dc2fc;hb=3ee667935c4cac82445ecd05c8ae421888dfd40f;hp=14503b4b5f88a94db769f81d752b7916360aeb4a;hpb=102fffd24eb36b4b8322b3f139166ce5f5a4b7d4;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_grs.c b/retrieval/d1_grs.c
index 14503b4..6530e7f 100644
--- a/retrieval/d1_grs.c
+++ b/retrieval/d1_grs.c
@@ -1,10 +1,16 @@
 /*
- * Copyright (c) 1995-1998, Index Data.
+ * Copyright (c) 1995-1999, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_grs.c,v $
- * Revision 1.15  1999-03-31 11:18:25  adam
+ * Revision 1.17  1999-11-30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.16  1999/08/27 09:40:32  adam
+ * Renamed logf function to yaz_log. Removed VC++ project files.
+ *
+ * Revision 1.15  1999/03/31 11:18:25  adam
  * Implemented odr_strdup. Added Reference ID to backend server API.
  *
  * Revision 1.14  1998/03/16 12:21:15  adam
@@ -58,10 +64,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <proto.h>
-#include <log.h>
-
-#include <data1.h>
+#include <yaz/proto.h>
+#include <yaz/log.h>
+#include <yaz/data1.h>
 
 #define D1_VARIANTARRAY 20 /* fixed max length on sup'd variant-list. Lazy me */
 
@@ -124,8 +129,8 @@ static Z_Variant *make_variant(data1_node *n, int num, ODR o)
                     odr_strdup(o, p->u.variant.value);
 		break;
 	    default:
-		logf(LOG_WARN, "Unable to handle value for variant %s",
-		    p->u.variant.type->name);
+		yaz_log(LOG_WARN, "Unable to handle value for variant %s",
+			p->u.variant.type->name);
 		return 0;
 	}
     }
@@ -148,8 +153,8 @@ static int traverse_triples(data1_node *n, int level, Z_ElementMetaData *m,
 		    D1_VARIANTARRAY);
 	    else if (m->num_supportedVariants >= D1_VARIANTARRAY)
 	    {
-		logf(LOG_WARN, "Too many variants (D1_VARIANTARRAY==%d)",
-		    D1_VARIANTARRAY);
+		yaz_log(LOG_WARN, "Too many variants (D1_VARIANTARRAY==%d)",
+			D1_VARIANTARRAY);
 		return -1;
 	    }
 
@@ -209,7 +214,7 @@ static Z_ElementData *nodetoelementdata(data1_handle dh, data1_node *n,
 		*len += n->u.data.len;
 		break;
 	    default:
-	    	logf(LOG_WARN, "Can't handle datatype.");
+	    	yaz_log(LOG_WARN, "Can't handle datatype.");
 		return 0;
 	}
     }
@@ -247,7 +252,7 @@ static Z_TaggedElement *nodetotaggedelement(data1_handle dh, data1_node *n,
 	if (!(tag = data1_gettagbyname (dh, n->root->u.root.absyn->tagset,
 					"wellKnown")))
 	{
-	    logf(LOG_WARN, "Unable to locate tag for 'wellKnown'");
+	    yaz_log(LOG_WARN, "Unable to locate tag for 'wellKnown'");
 	    return 0;
 	}
 	data = n;
@@ -255,7 +260,7 @@ static Z_TaggedElement *nodetotaggedelement(data1_handle dh, data1_node *n,
     }
     else
     {
-	logf(LOG_WARN, "Bad data.");
+	yaz_log(LOG_WARN, "Bad data.");
 	return 0;
     }