X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frstemp.c;h=f43e5e2383179c68f837148b4da9716b4457ab13;hb=5b886a7358c16434d5c9f5f0d4af2f6e2e5d5c73;hp=5eb0db900261fd9ccfcf5a98256e23325f8972fa;hpb=0d90384223b4055ab3c6275ee3aa038c5a7884c7;p=idzebra-moved-to-github.git diff --git a/rset/rstemp.c b/rset/rstemp.c index 5eb0db9..f43e5e2 100644 --- a/rset/rstemp.c +++ b/rset/rstemp.c @@ -1,10 +1,38 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1997, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rstemp.c,v $ - * Revision 1.16 1995-11-28 14:47:02 adam + * 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,35 +88,40 @@ #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); +static void *r_create(const struct rset_control *sel, void *parms, + int *flags); 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_hits (RSET ct, void *oi); static int r_read (RSFD rfd, void *buf); 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 = { - "Temporary set", + "temp", r_create, r_open, r_close, r_delete, r_rewind, r_count, + r_hits, r_read, r_write, r_score @@ -107,6 +140,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,11 +149,11 @@ struct rset_temp_rfd { struct rset_temp_rfd *next; }; -static void *r_create(const struct rset_control *sel, void *parms) +static void *r_create(const struct rset_control *sel, void *parms, int *flags) { rset_temp_parms *temp_parms = parms; struct rset_temp_info *info; - + info = xmalloc (sizeof(struct rset_temp_info)); info->fd = -1; info->fname = NULL; @@ -129,12 +164,15 @@ static void *r_create(const struct rset_control *sel, void *parms) 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); } + return info; } @@ -147,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); @@ -171,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); @@ -219,6 +257,7 @@ static void r_close (RSFD rfd) close (info->fd); info->fd = -1; } + xfree (rfd); } static void r_delete (RSET ct) @@ -227,15 +266,17 @@ 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); + xfree (info); } /* r_reread: @@ -293,6 +334,13 @@ static int r_count (RSET ct) return info->pos_end / info->key_size; } +static int r_hits (RSET ct, void *oi) +{ + struct rset_temp_info *info = ct->buf; + + return info->hits; +} + static int r_read (RSFD rfd, void *buf) { struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;