X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frstemp.c;h=b492f0e5b1b23d890f91764105237090cc56af8a;hb=1e58ebd4607490d810c7396a4e87eb70d9528166;hp=f15200b3b550e1683bc0dc98a70b80523d3799bc;hpb=726c42c6ae793b79a5351d2fce805d220d21321e;p=idzebra-moved-to-github.git diff --git a/rset/rstemp.c b/rset/rstemp.c index f15200b..b492f0e 100644 --- a/rset/rstemp.c +++ b/rset/rstemp.c @@ -1,4 +1,4 @@ -/* $Id: rstemp.c,v 1.49 2004-09-09 10:08:06 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 @@ -37,19 +37,20 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 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, @@ -78,13 +79,20 @@ struct rset_temp_rfd { zint cur; /* number of the current hit */ }; +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) + const char *temp_path,TERMID term) { - RSET rnew=rset_create_base(&control, nmem, kcontrol, scope); + 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; @@ -107,10 +115,10 @@ static void r_delete (RSET ct) { struct rset_temp_info *info = (struct rset_temp_info*) ct->priv; - 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); } } @@ -130,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); } } @@ -139,8 +147,13 @@ static RSFD r_open (RSET ct, int flag) 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); - } - r_rewind (rfd); + } else + prfd= rfd->priv; + r_flush (rfd, 0); + prfd->pos_cur = 0; + info->pos_buf = 0; + r_reread (rfd); + prfd->cur=0; return rfd; } @@ -166,7 +179,7 @@ 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= nmem_malloc(rfd->rset->nmem,strlen(template)+1); @@ -176,11 +189,11 @@ static void r_flush (RSFD rfd, int mk) 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 @@ -192,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; @@ -201,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); } @@ -248,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); } @@ -266,18 +279,8 @@ 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; @@ -294,6 +297,9 @@ static int r_read (RSFD rfd, void *buf) } memcpy (buf, info->buf_mem + (mrfd->pos_cur - info->pos_buf), 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;