X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_sumout.c;h=8d30ccae069b0b47ec4f2b28a113f782d1218632;hp=4146d07a9a1608436588c4fb96e0a9e33a83afc5;hb=11d386bdb7b6b4a9bba10da749a5770b509c1fbd;hpb=22963c0b23a178529bc71e5879c7e4f9c3c9b7f9

diff --git a/data1/d1_sumout.c b/data1/d1_sumout.c
index 4146d07..8d30cca 100644
--- a/data1/d1_sumout.c
+++ b/data1/d1_sumout.c
@@ -1,8 +1,5 @@
-/* $Id: d1_sumout.c,v 1.3 2004-09-28 10:15:03 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
-
-This file is part of the Zebra server.
+/* 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
@@ -15,11 +12,14 @@ 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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
@@ -28,18 +28,15 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/proto.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)
@@ -63,7 +60,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;
     }
 
@@ -87,7 +84,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)
@@ -109,8 +106,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
+ */
+