projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Read-only sets uses common no write handler
[idzebra-moved-to-github.git]
/
data1
/
d1_sumout.c
diff --git
a/data1/d1_sumout.c
b/data1/d1_sumout.c
index
fc2aca5
..
ec84f20
100644
(file)
--- a/
data1/d1_sumout.c
+++ b/
data1/d1_sumout.c
@@
-1,8
+1,5
@@
-/* $Id: d1_sumout.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
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 2004-2013 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
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,31
+12,31
@@
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
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>
#include <yaz/log.h>
#include <yaz/proto.h>
#include <assert.h>
#include <string.h>
#include <stdlib.h>
#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;
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);
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)
}
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"))
{
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;
}
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)
{
{
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)
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:
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;
}
}
}
return res;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+