X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frstemp.c;h=b492f0e5b1b23d890f91764105237090cc56af8a;hb=e505b6cf2a7f6821264d82cd2e8869b2be38d0b2;hp=4450132f89641d4041e243ad827e5c9cfed92767;hpb=70effaa5a4a18f1bef9c6111dc082bb8714e4c19;p=idzebra-moved-to-github.git diff --git a/rset/rstemp.c b/rset/rstemp.c index 4450132..b492f0e 100644 --- a/rset/rstemp.c +++ b/rset/rstemp.c @@ -1,4 +1,4 @@ -/* $Id: rstemp.c,v 1.47 2004-08-31 10:43:40 heikki Exp $ +/* $Id: rstemp.c,v 1.55 2004-11-19 10:27:14 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 Index Data Aps @@ -32,24 +32,25 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#include +#include 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_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); static const struct rset_control control = { "temp", r_delete, + rset_get_one_term, r_open, r_close, - r_rewind, rset_default_forward, r_pos, r_read, @@ -59,9 +60,8 @@ static const struct rset_control control = 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 */ @@ -70,7 +70,6 @@ struct rset_temp_info { 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 { @@ -80,24 +79,29 @@ struct rset_temp_rfd { 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; - + 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; if (!temp_path) info->temp_path = NULL; @@ -111,19 +115,12 @@ 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 */ } @@ -141,7 +138,7 @@ static RSFD r_open (RSET ct, int flag) 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); } } @@ -149,9 +146,14 @@ static RSFD r_open (RSET ct, int flag) if (!rfd->priv){ prfd= (struct rset_temp_rfd *) nmem_malloc(ct->nmem, sizeof(*prfd)); rfd->priv=(void *)prfd; - prfd->buf = nmem_malloc (ct->nmem,info->key_size); - } - r_rewind (rfd); + 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; } @@ -177,21 +179,21 @@ static void r_flush (RSFD rfd, int mk) 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 @@ -203,7 +205,7 @@ static void r_flush (RSFD rfd, int mk) 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; @@ -212,9 +214,9 @@ static void r_flush (RSFD rfd, int mk) 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); } @@ -259,15 +261,15 @@ static void r_reread (RSFD rfd) { 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); } @@ -277,23 +279,13 @@ static void r_reread (RSFD rfd) info->pos_border = info->pos_end; } -static void r_rewind (RSFD rfd) -{ - 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); - mrfd->pos_cur = 0; - info->pos_buf = 0; - r_reread (rfd); - mrfd->cur=0; -} -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->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) { @@ -304,7 +296,10 @@ static int r_read (RSFD rfd, void *buf) 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; @@ -315,7 +310,7 @@ static int r_write (RSFD rfd, const void *buf) 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) { @@ -326,7 +321,7 @@ static int r_write (RSFD rfd, const void *buf) } 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;