X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frstemp.c;h=c02121bc42c7f67fb6a48153ae6a96c568ae635e;hp=9448002df830feddf3a7757a6f9e05741a74529c;hb=d02c4c703a93e0ad3f4ccde4519879f1f57a6824;hpb=d50126fa619f94079daa731d66c305e86a38a85a diff --git a/rset/rstemp.c b/rset/rstemp.c index 9448002..c02121b 100644 --- a/rset/rstemp.c +++ b/rset/rstemp.c @@ -1,8 +1,5 @@ -/* $Id: rstemp.c,v 1.50 2004-09-30 09:53:05 heikki Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 - Index Data Aps - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 1994-2011 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 @@ -15,50 +12,53 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ -#include +#if HAVE_CONFIG_H +#include +#endif #include +#include +#include +#include +#include #ifdef WIN32 #include -#else +#endif +#if HAVE_UNISTD_H #include #endif -#include #include -#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 int r_read (RSFD rfd, void *buf); -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 RSFD r_open(RSET ct, int flag); +static void r_close(RSFD rfd); +static void r_delete(RSET ct); +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 = +static const struct rset_control control = { "temp", r_delete, + rset_get_one_term, r_open, r_close, - rset_default_forward, - r_pos, + 0, /* no forward */ + r_pos, r_read, r_write, }; -const struct rset_control *rset_kind_temp = &control; - -struct rset_temp_info { +struct rset_private { int fd; /* file descriptor for temp file */ char *fname; /* name of temp file */ char *buf_mem; /* window buffer */ @@ -67,29 +67,36 @@ struct rset_temp_info { size_t pos_buf; /* position of first byte in window */ size_t pos_border; /* position of last byte+1 in window */ int dirty; /* window is dirty */ - zint hits; /* no of hits */ + zint hits; /* no of hits */ char *temp_path; }; -struct rset_temp_rfd { +struct rfd_private { 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, const struct key_control *kcontrol, - int scope, - const char *temp_path) +static int log_level = 0; +static int log_level_initialized = 0; + +RSET rset_create_temp(NMEM nmem, struct rset_key_control *kcontrol, + int scope, const char *temp_path, TERMID term) { - RSET rnew=rset_create_base(&control, nmem, kcontrol, scope); - struct rset_temp_info *info; - - info = (struct rset_temp_info *) nmem_malloc(rnew->nmem, sizeof(*info)); + RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term, + 0, 0); + struct rset_private *info; + if (!log_level_initialized) + { + log_level = yaz_log_module_level("rstemp"); + log_level_initialized = 1; + } + info = (struct rset_private *) nmem_malloc(rnew->nmem, sizeof(*info)); info->fd = -1; info->fname = NULL; info->buf_size = 4096; - info->buf_mem = (char *) nmem_malloc (rnew->nmem, info->buf_size); + info->buf_mem = (char *) nmem_malloc(rnew->nmem, info->buf_size); info->pos_end = 0; info->pos_buf = 0; info->dirty = 0; @@ -98,95 +105,97 @@ RSET rstemp_create( NMEM nmem, const struct key_control *kcontrol, if (!temp_path) info->temp_path = NULL; else - info->temp_path = nmem_strdup(rnew->nmem,temp_path); - rnew->priv=info; + info->temp_path = nmem_strdup(rnew->nmem, temp_path); + rnew->priv = info; return rnew; } /* rstemp_create */ -static void r_delete (RSET ct) +static void r_delete(RSET ct) { - struct rset_temp_info *info = (struct rset_temp_info*) ct->priv; + struct rset_private *info = (struct rset_private*) 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); - unlink (info->fname); + yaz_log(log_level, "r_delete: unlink %s", info->fname); + unlink(info->fname); } } - -static RSFD r_open (RSET ct, int flag) +static RSFD r_open(RSET ct, int flag) { - struct rset_temp_info *info = (struct rset_temp_info *) ct->priv; + struct rset_private *info = (struct rset_private *) ct->priv; RSFD rfd; - struct rset_temp_rfd *prfd; + struct rfd_private *prfd; if (info->fd == -1 && info->fname) { if (flag & RSETF_WRITE) - info->fd = open (info->fname, O_BINARY|O_RDWR|O_CREAT, 0666); + info->fd = open(info->fname, O_BINARY|O_RDWR|O_CREAT, 0666); else - info->fd = open (info->fname, O_BINARY|O_RDONLY); + info->fd = open(info->fname, O_BINARY|O_RDONLY); if (info->fd == -1) { - logf (LOG_FATAL|LOG_ERRNO, "open %s", info->fname); - exit (1); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open failed %s", info->fname); + zebra_exit("r_open"); } } 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 + if (!rfd->priv) + { + 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); + r_flush(rfd, 0); prfd->pos_cur = 0; info->pos_buf = 0; - r_reread (rfd); - prfd->cur=0; + r_reread(rfd); + prfd->cur = 0; return rfd; } /* r_flush: flush current window to file if file is assocated with set */ -static void r_flush (RSFD rfd, int mk) +static void r_flush(RSFD rfd, int mk) { - /* struct rset_temp_info *info = ((struct rset_temp_rfd*) rfd)->info; */ - struct rset_temp_info *info = rfd->rset->priv; + struct rset_private *info = rfd->rset->priv; if (!info->fname && mk) { #if HAVE_MKSTEMP char template[1024]; - if (info->temp_path) - sprintf (template, "%s/zrsXXXXXX", info->temp_path); - else - sprintf (template, "zrsXXXXXX"); + *template = '\0'; - info->fd = mkstemp (template); + if (info->temp_path) + sprintf(template, "%s/", info->temp_path); + strcat(template, "zrs_"); +#if HAVE_UNISTD_H + sprintf(template + strlen(template), "%ld_", (long) getpid()); +#endif + strcat(template, "XXXXXX"); + info->fd = mkstemp(template); if (info->fd == -1) { - logf (LOG_FATAL|LOG_ERRNO, "mkstemp %s", template); - exit (1); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: mkstemp %s", template); + zebra_exit("r_flush"); } - info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1); - strcpy (info->fname, template); + info->fname = nmem_strdup(rfd->rset->nmem, template); #else - char *s = (char*) tempnam (info->temp_path, "zrs"); - info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1); - strcpy (info->fname, s); + char *s = (char*) tempnam(info->temp_path, "zrs"); + info->fname= nmem_strdup(rfd->rset->nmem, s); - logf (LOG_DEBUG, "creating tempfile %s", info->fname); - info->fd = open (info->fname, O_BINARY|O_RDWR|O_CREAT, 0666); + 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); - exit (1); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open %s", info->fname); + zebra_exit("r_flush"); } #endif } @@ -194,39 +203,40 @@ static void r_flush (RSFD rfd, int mk) { size_t count; int r; - - if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1) + + if (lseek(info->fd, info->pos_buf, SEEK_SET) == -1) { - logf (LOG_FATAL|LOG_ERRNO, "lseek %s", info->fname); - exit (1); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek (1) %s", info->fname); + zebra_exit("r_flusxh"); } count = info->buf_size; if (count > info->pos_end - info->pos_buf) count = info->pos_end - info->pos_buf; - if ((r = write (info->fd, info->buf_mem, count)) < (int) count) + 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); + zebra_exit("r_flush"); } info->dirty = 0; } } -static void r_close (RSFD rfd) +static void r_close(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); - if (info->fname && info->fd != -1) + struct rset_private *info = (struct rset_private *)rfd->rset->priv; + if (rfd_is_last(rfd)) { - close (info->fd); - info->fd = -1; - } /* FIXME - Is this right, don't we risk closing the file too early ?*/ - rfd_delete_base(rfd); + r_flush(rfd, 0); + if (info->fname && info->fd != -1) + { + close(info->fd); + info->fd = -1; + } + } } @@ -234,10 +244,10 @@ static void r_close (RSFD rfd) read from file to window if file is assocated with set - indicated by fname */ -static void r_reread (RSFD rfd) +static void r_reread(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; + struct rfd_private *mrfd = (struct rfd_private*) rfd->priv; + struct rset_private *info = (struct rset_private *)rfd->rset->priv; if (info->fname) { @@ -251,19 +261,19 @@ static void r_reread (RSFD rfd) count = info->pos_border - info->pos_buf; if (count > 0) { - if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1) + if (lseek(info->fd, info->pos_buf, SEEK_SET) == -1) { - logf (LOG_FATAL|LOG_ERRNO, "lseek %s", info->fname); - exit (1); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek (2) %s fd=%d", info->fname, info->fd); + zebra_exit("r_reread"); } - if ((r = read (info->fd, info->buf_mem, count)) < (int) count) + 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); + zebra_exit("r_reread"); } } } @@ -271,11 +281,10 @@ static void r_reread (RSFD rfd) info->pos_border = info->pos_end; } - -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; + 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; @@ -283,33 +292,36 @@ static int r_read (RSFD rfd, void *buf) { if (nc > info->pos_end) return 0; - r_flush (rfd, 0); + r_flush(rfd, 0); info->pos_buf = mrfd->pos_cur; - r_reread (rfd); + r_reread(rfd); } - memcpy (buf, info->buf_mem + (mrfd->pos_cur - info->pos_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; } -static int r_write (RSFD rfd, const void *buf) +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; + 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; if (nc > info->pos_buf + info->buf_size) { - r_flush (rfd, 1); + r_flush(rfd, 1); info->pos_buf = mrfd->pos_cur; if (info->pos_buf < info->pos_end) - r_reread (rfd); + r_reread(rfd); } info->dirty = 1; - memcpy (info->buf_mem + (mrfd->pos_cur - info->pos_buf), buf, + memcpy(info->buf_mem + (mrfd->pos_cur - info->pos_buf), buf, rfd->rset->keycontrol->key_size); mrfd->pos_cur = nc; if (nc > info->pos_end) @@ -318,12 +330,20 @@ static int r_write (RSFD rfd, const void *buf) return 1; } -static void r_pos (RSFD rfd, double *current, double *total) +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->priv; - struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv; - - *current=(double) mrfd->cur; - *total=(double) info->hits; + 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; } +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +