X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsisamb.c;h=62e63d718cc41d2244afb2456581a2cd40bbe4ce;hp=986946b2e2c1589cf5b4bef6c3b7ea251dc9b298;hb=00d6544408e2de88277e091fb7f8f4dfe3949558;hpb=89d3a004b7c651fd5673abfc192e1472dc4d4197 diff --git a/rset/rsisamb.c b/rset/rsisamb.c index 986946b..62e63d7 100644 --- a/rset/rsisamb.c +++ b/rset/rsisamb.c @@ -1,8 +1,5 @@ -/* $Id: rsisamb.c,v 1.38 2007-01-15 15:10:19 adam Exp $ - Copyright (C) 1995-2007 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 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 @@ -20,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -33,32 +33,31 @@ static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf); static void r_pos(RSFD rfd, double *current, double *total); 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 const struct rset_control control = +static const struct rset_control control = { "isamb", r_delete, rset_get_one_term, r_open, r_close, - r_forward, + r_forward, r_pos, r_read, - r_write, + rset_no_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, - r_forward, + r_forward, r_pos, r_read_filter, - r_write, + rset_no_write, }; struct rfd_private { @@ -141,7 +140,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"); - return rc; + return rc; } static void r_pos(RSFD rfd, double *current, double *total) @@ -181,14 +180,10 @@ static int r_read_filter(RSFD rfd, void *buf, TERMID *term) return rc; } -static int r_write(RSFD rfd, const void *buf) -{ - yaz_log(YLOG_FATAL, "ISAMB set type is read-only"); - return -1; -} /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab