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
Update NEWS
[idzebra-moved-to-github.git]
/
rset
/
rsisamb.c
diff --git
a/rset/rsisamb.c
b/rset/rsisamb.c
index
c6f3978
..
496e78a
100644
(file)
--- a/
rset/rsisamb.c
+++ b/
rset/rsisamb.c
@@
-1,8
+1,5
@@
-/* $Id: rsisamb.c,v 1.37 2006-08-14 10:40:21 adam Exp $
- Copyright (C) 1995-2006
- 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
@@
-20,6
+17,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <assert.h>
#include <idzebra/util.h>
#include <stdio.h>
#include <assert.h>
#include <idzebra/util.h>
@@
-35,27
+35,27
@@
static int r_read(RSFD rfd, void *buf, TERMID *term);
static int r_read_filter(RSFD rfd, void *buf, TERMID *term);
static int r_write(RSFD rfd, const void *buf);
static int r_read_filter(RSFD rfd, void *buf, TERMID *term);
static int r_write(RSFD rfd, const void *buf);
-static const struct rset_control control =
+static const struct rset_control control =
{
"isamb",
r_delete,
rset_get_one_term,
r_open,
r_close,
{
"isamb",
r_delete,
rset_get_one_term,
r_open,
r_close,
- r_forward,
+ r_forward,
r_pos,
r_read,
r_write,
};
r_pos,
r_read,
r_write,
};
-static const struct rset_control control_filter =
+static const struct rset_control control_filter =
{
"isamb",
r_delete,
rset_get_one_term,
r_open,
r_close,
{
"isamb",
r_delete,
rset_get_one_term,
r_open,
r_close,
- r_forward,
+ r_forward,
r_pos,
r_read_filter,
r_write,
r_pos,
r_read_filter,
r_write,
@@
-141,7
+141,7
@@
static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf)
if (rc && term)
*term = rfd->rset->term;
yaz_log(log_level, "rsisamb_forward");
if (rc && term)
*term = rfd->rset->term;
yaz_log(log_level, "rsisamb_forward");
- return rc;
+ return rc;
}
static void r_pos(RSFD rfd, double *current, double *total)
}
static void r_pos(RSFD rfd, double *current, double *total)
@@
-189,6
+189,7
@@
static int r_write(RSFD rfd, const void *buf)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab