X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=rset%2Frstemp.c;h=fe300448237a5219b263f09a4dfba5f89ece7782;hb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;hp=5eb0db900261fd9ccfcf5a98256e23325f8972fa;hpb=0d90384223b4055ab3c6275ee3aa038c5a7884c7;p=idzebra-moved-to-github.git diff --git a/rset/rstemp.c b/rset/rstemp.c index 5eb0db9..fe30044 100644 --- a/rset/rstemp.c +++ b/rset/rstemp.c @@ -1,10 +1,47 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rstemp.c,v $ - * Revision 1.16 1995-11-28 14:47:02 adam + * Revision 1.26 1999-05-26 07:49:14 adam + * C++ compilation. + * + * Revision 1.25 1999/02/02 14:51:37 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.24 1998/03/05 08:36:28 adam + * New result set model. + * + * Revision 1.23 1997/12/18 10:54:25 adam + * New method result set method rs_hits that returns the number of + * hits in result-set (if known). The ranked result set returns real + * number of hits but only when not combined with other operands. + * + * Revision 1.22 1997/10/31 12:38:12 adam + * Bug fix: added missing xfree() call. + * + * Revision 1.21 1997/09/17 12:19:23 adam + * Zebra version corresponds to YAZ version 1.4. + * Changed Zebra server so that it doesn't depend on global common_resource. + * + * Revision 1.20 1997/09/09 13:38:17 adam + * Partial port to WIN95/NT. + * + * Revision 1.19 1997/09/04 13:58:57 adam + * Added O_BINARY for open calls. + * + * Revision 1.18 1996/10/29 13:54:52 adam + * Changed name of setting tempSetDir to setTmpDir. + * + * Revision 1.17 1995/12/11 09:15:28 adam + * New set types: sand/sor/snot - ranked versions of and/or/not in + * ranked/semi-ranked result sets. + * Note: the snot not finished yet. + * New rset member: flag. + * Bug fix: r_delete in rsrel.c did free bad memory block. + * + * Revision 1.16 1995/11/28 14:47:02 adam * New setting: tempSetPath. Location of temporary result sets. * * Revision 1.15 1995/10/12 12:41:58 adam @@ -60,29 +97,30 @@ #include #include +#ifdef WIN32 +#include +#else #include +#endif +#include #include #include -#include +#include #include -static void *r_create(const struct rset_control *sel, void *parms); +static void *r_create(RSET ct, const struct rset_control *sel, void *parms); 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, int *term_index); static int r_write (RSFD rfd, const void *buf); -static int r_score (RSFD rfd, int *score); -static int temppath_init = 0; -static char *temppath_root = NULL; - -static const rset_control control = +static const struct rset_control control = { - "Temporary set", + "temp", r_create, r_open, r_close, @@ -91,10 +129,9 @@ static const rset_control control = r_count, r_read, r_write, - r_score }; -const rset_control *rset_kind_temp = &control; +const struct rset_control *rset_kind_temp = &control; struct rset_temp_info { int fd; @@ -107,6 +144,8 @@ 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 */ + int hits; /* no of hits */ + char *temp_path; }; struct rset_temp_rfd { @@ -114,49 +153,54 @@ struct rset_temp_rfd { struct rset_temp_rfd *next; }; -static void *r_create(const struct rset_control *sel, void *parms) +static void *r_create(RSET ct, const struct rset_control *sel, void *parms) { - rset_temp_parms *temp_parms = parms; + rset_temp_parms *temp_parms = (rset_temp_parms *) parms; struct rset_temp_info *info; - - info = xmalloc (sizeof(struct rset_temp_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 = xmalloc (info->buf_size); + info->buf_mem = (char *) xmalloc (info->buf_size); info->pos_cur = 0; info->pos_end = 0; info->pos_buf = 0; info->dirty = 0; - - if (!temppath_init) + info->hits = -1; + if (!temp_parms->temp_path) + info->temp_path = NULL; + else { - temppath_init = 1; - temppath_root = res_get (common_resource, "tempSetPath"); + info->temp_path = (char *) xmalloc (strlen(temp_parms->temp_path)+1); + strcpy (info->temp_path, temp_parms->temp_path); } + ct->no_rset_terms = 1; + ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms)); + ct->rset_terms[0] = temp_parms->rset_term; return info; } static RSFD r_open (RSET ct, int flag) { - struct rset_temp_info *info = ct->buf; + struct rset_temp_info *info = (struct rset_temp_info *) ct->buf; struct rset_temp_rfd *rfd; assert (info->fd == -1); if (info->fname) { if (flag & RSETF_WRITE) - info->fd = open (info->fname, O_RDWR|O_CREAT, 0666); + info->fd = open (info->fname, O_BINARY|O_RDWR|O_CREAT, 0666); else - info->fd = open (info->fname, 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); } } - rfd = xmalloc (sizeof(*rfd)); + rfd = (struct rset_temp_rfd *) xmalloc (sizeof(*rfd)); rfd->info = info; r_rewind (rfd); return rfd; @@ -171,13 +215,13 @@ static void r_flush (RSFD rfd, int mk) if (!info->fname && mk) { - char *s = (char*) tempnam (temppath_root, "zrs"); + char *s = (char*) tempnam (info->temp_path, "zrs"); - info->fname = xmalloc (strlen(s)+1); + info->fname = (char *) xmalloc (strlen(s)+1); strcpy (info->fname, s); logf (LOG_DEBUG, "creating tempfile %s", info->fname); - info->fd = open (info->fname, O_RDWR|O_CREAT, 0666); + 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); @@ -186,7 +230,8 @@ static void r_flush (RSFD rfd, int mk) } if (info->fname && info->fd != -1 && info->dirty) { - size_t r, count; + size_t count; + int r; if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1) { @@ -196,7 +241,7 @@ static void r_flush (RSFD rfd, int mk) 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)) < count) + if ((r = write (info->fd, info->buf_mem, count)) < (int) count) { if (r == -1) logf (LOG_FATAL|LOG_ERRNO, "read %s", info->fname); @@ -219,23 +264,28 @@ static void r_close (RSFD rfd) close (info->fd); info->fd = -1; } + xfree (rfd); } static void r_delete (RSET ct) { - struct rset_temp_info *info = ct->buf; + struct rset_temp_info *info = (struct rset_temp_info*) ct->buf; if (info->fname) unlink (info->fname); - free (info->buf_mem); + xfree (info->buf_mem); logf (LOG_DEBUG, "r_delete: set size %ld", (long) info->pos_end); if (info->fname) { logf (LOG_DEBUG, "r_delete: unlink %s", info->fname); unlink (info->fname); - free (info->fname); + xfree (info->fname); } - free (info); + if (info->temp_path) + xfree (info->temp_path); + rset_term_destroy (ct->rset_terms[0]); + xfree (ct->rset_terms); + xfree (info); } /* r_reread: @@ -248,7 +298,8 @@ static void r_reread (RSFD rfd) if (info->fname) { - size_t r, count; + size_t count; + int r; info->pos_border = info->pos_cur + info->buf_size; if (info->pos_border > info->pos_end) @@ -261,7 +312,7 @@ static void r_reread (RSFD rfd) logf (LOG_FATAL|LOG_ERRNO, "lseek %s", info->fname); exit (1); } - if ((r = read (info->fd, info->buf_mem, count)) < count) + if ((r = read (info->fd, info->buf_mem, count)) < (int) count) { if (r == -1) logf (LOG_FATAL|LOG_ERRNO, "read %s", info->fname); @@ -288,12 +339,12 @@ static void r_rewind (RSFD rfd) static int r_count (RSET ct) { - struct rset_temp_info *info = ct->buf; + 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, int *term_index) { struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info; @@ -310,6 +361,7 @@ static int r_read (RSFD rfd, void *buf) memcpy (buf, info->buf_mem + (info->pos_cur - info->pos_buf), info->key_size); info->pos_cur = nc; + *term_index = 0; return 1; } @@ -334,9 +386,3 @@ static int r_write (RSFD rfd, const void *buf) info->pos_border = info->pos_end = nc; return 1; } - -static int r_score (RSFD rfd, int *score) -{ - *score = -1; - return -1; -}