-/* $Id: rstemp.c,v 1.45 2004-08-24 14:25:16 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
- Index Data Aps
+/* $Id: rstemp.c,v 1.57 2005-01-15 19:38:35 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
#include <stdio.h>
#include <zebrautl.h>
-#include <rstemp.h>
+#include <rset.h>
static RSFD r_open (RSET ct, int flag);
static void r_close (RSFD rfd);
static void r_delete (RSET ct);
-static void r_rewind (RSFD rfd);
-/* static int r_count (RSET ct);*/
-static int r_read (RSFD rfd, void *buf);
+static int r_read (RSFD rfd, void *buf, TERMID *term);
static int r_write (RSFD rfd, const void *buf);
static void r_pos (RSFD rfd, double *current, double *total);
+static void r_flush (RSFD rfd, int mk);
+static void r_reread (RSFD rfd);
-/* FIXME - Use the nmem instead of xmalloc all the way through */
static const struct rset_control control =
{
"temp",
+ r_delete,
+ rset_get_one_term,
r_open,
r_close,
- r_delete,
- r_rewind,
rset_default_forward,
r_pos,
r_read,
const struct rset_control *rset_kind_temp = &control;
struct rset_temp_info {
- int fd;
- char *fname;
- size_t key_size; /* key size */
+ int fd; /* file descriptor for temp file */
+ char *fname; /* name of temp file */
char *buf_mem; /* window buffer */
size_t buf_size; /* size of window */
size_t pos_end; /* last position in set */
int dirty; /* window is dirty */
zint hits; /* no of hits */
char *temp_path;
- int (*cmp)(const void *p1, const void *p2);
- struct rset_temp_rfd *rfd_list;
};
struct rset_temp_rfd {
- struct rset_temp_info *info;
- struct rset_temp_rfd *next;
void *buf;
size_t pos_cur; /* current position in set */
+ /* FIXME - term pos or what ?? */
zint cur; /* number of the current hit */
};
-RSET rstemp_create( NMEM nmem, int key_size,
- int (*cmp)(const void *p1, const void *p2),
- const char *temp_path)
+static int log_level=0;
+static int log_level_initialized=0;
+
+RSET rstemp_create( NMEM nmem, const struct key_control *kcontrol,
+ int scope,
+ const char *temp_path,TERMID term)
{
- RSET rnew=rset_create_base(&control, nmem);
+ RSET rnew=rset_create_base(&control, nmem, kcontrol, scope,term);
struct rset_temp_info *info;
-
- info = (struct rset_temp_info *) nmem_malloc ( rnew->nmem, sizeof(*info));
+ if (!log_level_initialized)
+ {
+ log_level=yaz_log_module_level("rstemp");
+ log_level_initialized=1;
+ }
+ info = (struct rset_temp_info *) nmem_malloc(rnew->nmem, sizeof(*info));
info->fd = -1;
info->fname = NULL;
- info->key_size = key_size;
info->buf_size = 4096;
info->buf_mem = (char *) nmem_malloc (rnew->nmem, info->buf_size);
info->pos_end = 0;
info->pos_buf = 0;
info->dirty = 0;
info->hits = 0;
- info->cmp = cmp;
- info->rfd_list = NULL;
if (!temp_path)
info->temp_path = NULL;
return rnew;
} /* rstemp_create */
-#if 0
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
-{
- rset_temp_parms *temp_parms = (rset_temp_parms *) parms;
- struct rset_temp_info *info;
-
- info = (struct rset_temp_info *) xmalloc (sizeof(struct rset_temp_info));
- info->fd = -1;
- info->fname = NULL;
- info->key_size = temp_parms->key_size;
- info->buf_size = 4096;
- info->buf_mem = (char *) xmalloc (info->buf_size);
- info->pos_end = 0;
- info->pos_buf = 0;
- info->dirty = 0;
- info->hits = 0;
- info->cmp = temp_parms->cmp;
- info->rfd_list = NULL;
-
- if (!temp_parms->temp_path)
- info->temp_path = NULL;
- else
- {
- info->temp_path = (char *) xmalloc (strlen(temp_parms->temp_path)+1);
- strcpy (info->temp_path, temp_parms->temp_path);
- }
-
- return info;
-}
-#endif
-
static void r_delete (RSET ct)
{
struct rset_temp_info *info = (struct rset_temp_info*) ct->priv;
- xfree (info->buf_mem);
- logf (LOG_DEBUG, "r_delete: set size %ld", (long) info->pos_end);
+ yaz_log (log_level, "r_delete: set size %ld", (long) info->pos_end);
if (info->fname)
{
- logf (LOG_DEBUG, "r_delete: unlink %s", info->fname);
+ yaz_log (log_level, "r_delete: unlink %s", info->fname);
unlink (info->fname);
- xfree (info->fname); /* FIXME should be nmem'd, and not freed here */
}
- /*
- if (info->temp_path)
- xfree (info->temp_path);
- xfree (info);
- */ /* nmem'd */
}
static RSFD r_open (RSET ct, int flag)
{
struct rset_temp_info *info = (struct rset_temp_info *) ct->priv;
- struct rset_temp_rfd *rfd;
+ RSFD rfd;
+ struct rset_temp_rfd *prfd;
if (info->fd == -1 && info->fname)
{
info->fd = open (info->fname, O_BINARY|O_RDONLY);
if (info->fd == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "open %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: open failed %s", info->fname);
exit (1);
}
}
- rfd = (struct rset_temp_rfd *) xmalloc (sizeof(*rfd));
- rfd->next = info->rfd_list;
- info->rfd_list = rfd;
- rfd->info = info;
- r_rewind (rfd);
-
- rfd->buf = xmalloc (info->key_size);
-
+ rfd = rfd_create_base(ct);
+ if (!rfd->priv){
+ prfd= (struct rset_temp_rfd *) 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);
+ prfd->pos_cur = 0;
+ info->pos_buf = 0;
+ r_reread (rfd);
+ prfd->cur=0;
return rfd;
}
*/
static void r_flush (RSFD rfd, int mk)
{
- struct rset_temp_info *info = ((struct rset_temp_rfd*) rfd)->info;
+ /* struct rset_temp_info *info = ((struct rset_temp_rfd*) rfd)->info; */
+ struct rset_temp_info *info = rfd->rset->priv;
if (!info->fname && mk)
{
-#if HAVE_MKSTEMP
char template[1024];
+#if HAVE_MKSTEMP
if (info->temp_path)
sprintf (template, "%s/zrsXXXXXX", info->temp_path);
if (info->fd == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "mkstemp %s", template);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: mkstemp %s", template);
exit (1);
}
- info->fname = (char *) xmalloc (strlen(template)+1);
+ info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1);
strcpy (info->fname, template);
#else
char *s = (char*) tempnam (info->temp_path, "zrs");
- info->fname = (char *) xmalloc (strlen(s)+1);
+ info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1);
strcpy (info->fname, s);
- logf (LOG_DEBUG, "creating tempfile %s", info->fname);
+ yaz_log (log_level, "creating tempfile %s", info->fname);
info->fd = open (info->fname, O_BINARY|O_RDWR|O_CREAT, 0666);
if (info->fd == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "open %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: open %s", info->fname);
exit (1);
}
#endif
if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "lseek %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek %s", info->fname);
exit (1);
}
count = info->buf_size;
if ((r = write (info->fd, info->buf_mem, count)) < (int) count)
{
if (r == -1)
- logf (LOG_FATAL|LOG_ERRNO, "read %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: write %s", info->fname);
else
- logf (LOG_FATAL, "write of %ld but got %ld",
+ yaz_log (YLOG_FATAL, "rstemp: write of %ld but got %ld",
(long) count, (long) r);
exit (1);
}
static void r_close (RSFD rfd)
{
- struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;
- struct rset_temp_rfd **rfdp;
-
- for (rfdp = &info->rfd_list; *rfdp; rfdp = &(*rfdp)->next)
- if (*rfdp == rfd)
- {
- r_flush (*rfdp, 0);
- xfree ((*rfdp)->buf);
-
- *rfdp = (*rfdp)->next;
- xfree (rfd);
-
- if (!info->rfd_list && info->fname && info->fd != -1)
- {
- close (info->fd);
- info->fd = -1;
- }
- return;
- }
- logf (LOG_FATAL, "r_close but no rfd match!");
- assert (0);
+ /*struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv; */
+ struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv;
+ r_flush (rfd, 0);
+ if (info->fname && info->fd != -1)
+ {
+ close (info->fd);
+ info->fd = -1;
+ } /* FIXME - Is this right, don't we risk closing the file too early ?*/
+ rfd_delete_base(rfd);
}
*/
static void r_reread (RSFD rfd)
{
- struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;
+ struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv;
+ struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv;
if (info->fname)
{
size_t count;
int r;
- info->pos_border = ((struct rset_temp_rfd *)rfd)->pos_cur +
+ info->pos_border = mrfd->pos_cur +
info->buf_size;
if (info->pos_border > info->pos_end)
info->pos_border = info->pos_end;
{
if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "lseek %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek %s", info->fname);
exit (1);
}
if ((r = read (info->fd, info->buf_mem, count)) < (int) count)
{
if (r == -1)
- logf (LOG_FATAL|LOG_ERRNO, "read %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: read %s", info->fname);
else
- logf (LOG_FATAL, "read of %ld but got %ld",
+ yaz_log (YLOG_FATAL, "read of %ld but got %ld",
(long) count, (long) r);
exit (1);
}
info->pos_border = info->pos_end;
}
-static void r_rewind (RSFD rfd)
-{
- struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;
-
- r_flush (rfd, 0);
- ((struct rset_temp_rfd *)rfd)->pos_cur = 0;
- info->pos_buf = 0;
- r_reread (rfd);
- ((struct rset_temp_rfd *)rfd)->cur=0;
-}
-
-/*
-static int r_count (RSET ct)
-{
- struct rset_temp_info *info = (struct rset_temp_info *) ct->buf;
- return info->pos_end / info->key_size;
-}
-*/
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
{
- struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd;
- struct rset_temp_info *info = mrfd->info;
+ struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv;
+ struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv;
- size_t nc = mrfd->pos_cur + info->key_size;
+ size_t nc = mrfd->pos_cur + rfd->rset->keycontrol->key_size;
if (mrfd->pos_cur < info->pos_buf || nc > info->pos_border)
{
r_reread (rfd);
}
memcpy (buf, info->buf_mem + (mrfd->pos_cur - info->pos_buf),
- info->key_size);
+ rfd->rset->keycontrol->key_size);
+ if (term)
+ *term=rfd->rset->term;
+ /* FIXME - should we store and return terms ?? */
mrfd->pos_cur = nc;
mrfd->cur++;
return 1;
static int r_write (RSFD rfd, const void *buf)
{
- struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd;
- struct rset_temp_info *info = mrfd->info;
+ struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv;
+ struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv;
- size_t nc = mrfd->pos_cur + info->key_size;
+ size_t nc = mrfd->pos_cur + rfd->rset->keycontrol->key_size;
if (nc > info->pos_buf + info->buf_size)
{
}
info->dirty = 1;
memcpy (info->buf_mem + (mrfd->pos_cur - info->pos_buf), buf,
- info->key_size);
+ rfd->rset->keycontrol->key_size);
mrfd->pos_cur = nc;
if (nc > info->pos_end)
info->pos_border = info->pos_end = nc;
static void r_pos (RSFD rfd, double *current, double *total)
{
- struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd;
+ /* struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd; */
+ struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv;
+ struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv;
+
*current=(double) mrfd->cur;
- *total=(double) mrfd->info->hits;
+ *total=(double) info->hits;
}
projects / idzebra-moved-to-github.git / blobdiff