X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_expout.c;h=51048fa35fcbb850b2143da51a9b4f6bf055a259;hb=6ba9698e88c0283e40fa5980a1a6b551fff2d597;hp=26689cd9112939cef2f59529dc92ad36eb57d193;hpb=02266b68e2e2c86d8a8467ee56721926b365d2d0;p=idzebra-moved-to-github.git

diff --git a/data1/d1_expout.c b/data1/d1_expout.c
index 26689cd..51048fa 100644
--- a/data1/d1_expout.c
+++ b/data1/d1_expout.c
@@ -1,6 +1,6 @@
-/* $Id: d1_expout.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
+/* $Id: d1_expout.c,v 1.7 2006-05-10 08:13:18 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -30,7 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <yaz/log.h>
 #include <yaz/proto.h>
-#include <data1.h>
+#include <idzebra/data1.h>
 
 typedef struct {
     data1_handle dh;
@@ -47,12 +47,12 @@ static int is_numeric_tag (ExpHandle *eh, data1_node *c)
 	return 0;
     if (!c->u.tag.element)
     {
-	yaz_log(LOG_WARN, "Tag %s is local", c->u.tag.tag);
+	yaz_log(YLOG_WARN, "Tag %s is local", c->u.tag.tag);
 	return 0;
     }
     if (c->u.tag.element->tag->which != DATA1T_numeric)
     {
-	yaz_log(LOG_WARN, "Tag %s is not numeric", c->u.tag.tag);
+	yaz_log(YLOG_WARN, "Tag %s is not numeric", c->u.tag.tag);
 	return 0;
     }
     if (eh->select && !c->u.tag.node_selected)
@@ -1381,7 +1381,7 @@ Z_ExplainRecord *data1_nodetoexplain (data1_handle dh, data1_node *n,
     assert(n->which == DATA1N_root);
     if (strcmp(n->u.root.type, "explain"))
     {
-	yaz_log(LOG_WARN, "Attempt to convert a non-Explain record");
+	yaz_log(YLOG_WARN, "Attempt to convert a non-Explain record");
 	return 0;
     }
     for (n = n->child; n; n = n->next)
@@ -1415,6 +1415,14 @@ Z_ExplainRecord *data1_nodetoexplain (data1_handle dh, data1_node *n,
 	    return res;
 	}
     }
-    yaz_log(LOG_WARN, "No category in Explain record");
+    yaz_log(YLOG_WARN, "No category in Explain record");
     return 0;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+