X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frstemp.c;h=6110d2cb27dc83785c61f217c13a3abeeae3bbcf;hb=9fce226051f8b951b3c6f424fbdbd996ceb42007;hp=f200e8bdf49a8439f31b8f4dc7230a527287185a;hpb=7b0a5daa703117cde2dc0d54d5a39941a1c01ce8;p=idzebra-moved-to-github.git diff --git a/rset/rstemp.c b/rset/rstemp.c index f200e8b..6110d2c 100644 --- a/rset/rstemp.c +++ b/rset/rstemp.c @@ -1,10 +1,34 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1998, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rstemp.c,v $ - * Revision 1.17 1995-12-11 09:15:28 adam + * 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. @@ -67,28 +91,28 @@ #include #include +#ifdef WINDOWS +#include +#else #include +#endif +#include #include #include -#include +#include #include -static void *r_create(const struct rset_control *sel, void *parms, - int *flags); +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 = { "temp", r_create, @@ -99,10 +123,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; @@ -115,6 +138,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 { @@ -122,7 +147,7 @@ struct rset_temp_rfd { struct rset_temp_rfd *next; }; -static void *r_create(const struct rset_control *sel, void *parms, int *flags) +static void *r_create(RSET ct, const struct rset_control *sel, void *parms) { rset_temp_parms *temp_parms = parms; struct rset_temp_info *info; @@ -137,12 +162,17 @@ static void *r_create(const struct rset_control *sel, void *parms, int *flags) 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 = xmalloc (strlen(temp_parms->temp_path)+1); + strcpy (info->temp_path, temp_parms->temp_path); } + ct->no_rset_terms = 1; + ct->rset_terms = xmalloc (sizeof(*ct->rset_terms)); + ct->rset_terms[0] = temp_parms->rset_term; return info; } @@ -155,9 +185,9 @@ static RSFD r_open (RSET ct, int flag) 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); @@ -179,13 +209,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); 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); @@ -227,6 +257,7 @@ static void r_close (RSFD rfd) close (info->fd); info->fd = -1; } + xfree (rfd); } static void r_delete (RSET ct) @@ -235,15 +266,19 @@ static void r_delete (RSET ct) 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: @@ -301,7 +336,7 @@ static int r_count (RSET ct) 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; @@ -318,6 +353,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; } @@ -342,9 +378,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; -}