Using the new ylog.h everywhere, and fixing what that breaks!

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

diff --git a/data1/d1_sumout.c b/data1/d1_sumout.c
index a2cb932..d66a22e 100644 (file)
--- a/data1/d1_sumout.c
+++ b/data1/d1_sumout.c
@@ -1,18 +1,32 @@
-/*
- * Copyright (c) 1995-2002, Index Data.
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: d1_sumout.c,v 1.1 2002-10-22 12:53:33 adam Exp $
- */
+/* $Id: d1_sumout.c,v 1.4 2004-11-19 10:26:53 heikki 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 <string.h>
 #include <stdlib.h>
 
-#include <yaz/log.h>
+#include <yaz/ylog.h>
 #include <yaz/proto.h>
-#include <data1.h>
+#include <idzebra/data1.h>
 
 static int *f_integer(data1_node *c, ODR o)
 {
@@ -49,7 +63,7 @@ Z_BriefBib *data1_nodetosummary (data1_handle dh, data1_node *n,
     assert(n->which == DATA1N_root);
     if (strcmp(n->u.root.type, "summary"))
     {
-       yaz_log(LOG_WARN, "Attempt to convert a non-summary record");
+       yaz_log(YLOG_WARN, "Attempt to convert a non-summary record");
        return 0;
     }
 
@@ -73,7 +87,7 @@ Z_BriefBib *data1_nodetosummary (data1_handle dh, data1_node *n,
     {
        if (c->which != DATA1N_tag || !c->u.tag.element)
        {
-           yaz_log(LOG_WARN, "Malformed element in Summary record");
+           yaz_log(YLOG_WARN, "Malformed element in Summary record");
            return 0;
        }
        if (select && !c->u.tag.node_selected)
@@ -95,7 +109,7 @@ Z_BriefBib *data1_nodetosummary (data1_handle dh, data1_node *n,
            case 16: res->abstract = f_string(c, o); break;
            case 17: abort(); /* TODO */
            default:
-               yaz_log(LOG_WARN, "Unknown element in Summary record.");
+               yaz_log(YLOG_WARN, "Unknown element in Summary record.");
        }
     }
     return res;