using yaz/log.h again

[idzebra-moved-to-github.git] / data1 / d1_doespec.c

diff --git a/data1/d1_doespec.c b/data1/d1_doespec.c
index b809fa3..136c6be 100644 (file)
--- a/data1/d1_doespec.c
+++ b/data1/d1_doespec.c
@@ -1,17 +1,31 @@
-/*
- * Copyright (c) 1995-2002, Index Data.
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: d1_doespec.c,v 1.1 2002-10-22 12:53:33 adam Exp $
- */
+/* $Id: d1_doespec.c,v 1.5 2004-12-13 20:51:28 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+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 Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
 
 #include <assert.h>
 
-#include <yaz/oid.h>
 #include <yaz/log.h>
+#include <yaz/oid.h>
 #include <yaz/proto.h>
-#include <data1.h>
+#include <idzebra/data1.h>
 
 static int match_children(data1_handle dh, data1_node *n,
                          Z_Espec1 *e, int i, Z_ETagUnit **t,
@@ -183,7 +197,7 @@ static int match_children_here (data1_handle dh, data1_node *n,
        counter++;
        if (occur && occur->which == Z_Occurrences_last)
        {
-           yaz_log(LOG_WARN, "Can't do occurrences=last (yet)");
+           yaz_log(YLOG_WARN, "Can't do occurrences=last (yet)");
            return 0;
        }
        if (!occur || occur->which == Z_Occurrences_all ||