/* This file is part of the Zebra server.
- Copyright (C) 1994-2009 Index Data
+ 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
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <assert.h>
#include <fcntl.h>
#include <stdlib.h>
static void r_flush(RSFD rfd, int mk);
static void r_reread(RSFD rfd);
-static const struct rset_control control =
+static const struct rset_control control =
{
"temp",
r_delete,
r_open,
r_close,
0, /* no forward */
- r_pos,
+ r_pos,
r_read,
r_write,
};
info->temp_path = NULL;
else
info->temp_path = nmem_strdup(rnew->nmem, temp_path);
- rnew->priv = info;
+ rnew->priv = info;
return rnew;
} /* rstemp_create */
prfd = (struct rfd_private *) nmem_malloc(ct->nmem, sizeof(*prfd));
rfd->priv = (void *)prfd;
prfd->buf = nmem_malloc(ct->nmem,ct->keycontrol->key_size);
- }
+ }
else
prfd= rfd->priv;
r_flush(rfd, 0);
{
size_t count;
int r;
-
+
if (lseek(info->fd, info->pos_buf, SEEK_SET) == -1)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek (1) %s", info->fname);
*/
static void r_reread(RSFD rfd)
{
- struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
+ struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
struct rset_private *info = (struct rset_private *)rfd->rset->priv;
if (info->fname)
static int r_read(RSFD rfd, void *buf, TERMID *term)
{
- struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
+ struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
struct rset_private *info = (struct rset_private *)rfd->rset->priv;
size_t nc = mrfd->pos_cur + rfd->rset->keycontrol->key_size;
memcpy(buf, info->buf_mem + (mrfd->pos_cur - info->pos_buf),
rfd->rset->keycontrol->key_size);
if (term)
- *term = rfd->rset->term;
+ *term = rfd->rset->term;
/* FIXME - should we store and return terms ?? */
mrfd->pos_cur = nc;
mrfd->cur++;
static int r_write(RSFD rfd, const void *buf)
{
- struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
+ struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
struct rset_private *info = (struct rset_private *)rfd->rset->priv;
size_t nc = mrfd->pos_cur + rfd->rset->keycontrol->key_size;
static void r_pos(RSFD rfd, double *current, double *total)
{
- struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
+ struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
struct rset_private *info = (struct rset_private *)rfd->rset->priv;
-
+
*current = (double) mrfd->cur;
*total = (double) info->hits;
}