Happy new year.

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

diff --git a/data1/d1_sumout.c b/data1/d1_sumout.c
index a2cb932..fb4094f 100644 (file)
--- a/data1/d1_sumout.c
+++ b/data1/d1_sumout.c
@@ -1,10 +1,21 @@
-/*
- * 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 $
- */
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
+
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 #include <assert.h>
 #include <string.h>
@@ -12,20 +23,17 @@
 
 #include <yaz/log.h>
 #include <yaz/proto.h>
-#include <data1.h>
+#include <idzebra/data1.h>
 
-static int *f_integer(data1_node *c, ODR o)
+static Odr_int *f_integer(data1_node *c, ODR o)
 {
-    int *r;
     char intbuf[64];
 
     if (!c->child || c->child->which != DATA1N_data ||
        c->child->u.data.len > 63)
        return 0;
-    r = (int *)odr_malloc(o, sizeof(*r));
     sprintf(intbuf, "%.*s", 63, c->child->u.data.data);
-    *r = atoi(intbuf);
-    return r;
+    return odr_intdup(o, atoi(intbuf));
 }
 
 static char *f_string(data1_node *c, ODR o)
@@ -49,7 +57,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 +81,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,8 +103,17 @@ 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;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+