X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frstemp.c;h=21b0e79e0d93b78a1c5117309c2e6b7da50151d0;hb=74eec9c27962c38e3a6f0983f78adf7e9d7de0eb;hp=691ccb95796aef2e2cdfd1ea3d967d75a23ae062;hpb=0245f556af399689056b7810ed0e3de93021ad4a;p=idzebra-moved-to-github.git diff --git a/rset/rstemp.c b/rset/rstemp.c index 691ccb9..21b0e79 100644 --- a/rset/rstemp.c +++ b/rset/rstemp.c @@ -1,10 +1,40 @@ /* - * 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.14 1995-10-10 14:00:04 adam + * 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 + * Private info (buf) moved from struct rset_control to struct rset. + * Bug fixes in relevance. + * + * Revision 1.14 1995/10/10 14:00:04 adam * Function rset_open changed its wflag parameter to general flags. * * Revision 1.13 1995/10/06 14:38:06 adam @@ -53,27 +83,32 @@ #include #include +#ifdef WINDOWS +#include +#else #include +#endif +#include #include #include -#include +#include #include -static rset_control *r_create(const struct rset_control *sel, void *parms); -static RSFD r_open (rset_control *ct, int flag); +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_control *ct); +static void r_delete (RSET ct); static void r_rewind (RSFD rfd); -static int r_count (rset_control *ct); +static int r_count (RSET ct); 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 const rset_control control = { - "Temporary set", - 0, + "temp", r_create, r_open, r_close, @@ -98,6 +133,7 @@ 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 */ + char *temp_path; }; struct rset_temp_rfd { @@ -105,18 +141,12 @@ struct rset_temp_rfd { struct rset_temp_rfd *next; }; -static struct rset_control *r_create(const struct rset_control *sel, - void *parms) +static void *r_create(const struct rset_control *sel, void *parms, int *flags) { - rset_control *newct; rset_temp_parms *temp_parms = parms; struct rset_temp_info *info; - - newct = xmalloc(sizeof(*newct)); - memcpy(newct, sel, sizeof(*sel)); - newct->buf = xmalloc (sizeof(struct rset_temp_info)); - info = newct->buf; - + + info = xmalloc (sizeof(struct rset_temp_info)); info->fd = -1; info->fname = NULL; info->key_size = temp_parms->key_size; @@ -126,11 +156,18 @@ static struct rset_control *r_create(const struct rset_control *sel, info->pos_end = 0; info->pos_buf = 0; info->dirty = 0; + if (!temp_parms->temp_path) + info->temp_path = NULL; + else + { + info->temp_path = xmalloc (strlen(temp_parms->temp_path)+1); + strcpy (info->temp_path, temp_parms->temp_path); + } - return newct; + return info; } -static RSFD r_open (struct rset_control *ct, int flag) +static RSFD r_open (RSET ct, int flag) { struct rset_temp_info *info = ct->buf; struct rset_temp_rfd *rfd; @@ -139,9 +176,9 @@ static RSFD r_open (struct rset_control *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); @@ -163,13 +200,13 @@ static void r_flush (RSFD rfd, int mk) if (!info->fname && mk) { - char *s = (char*) tempnam (NULL, "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); @@ -211,23 +248,26 @@ static void r_close (RSFD rfd) close (info->fd); info->fd = -1; } + xfree (rfd); } -static void r_delete (struct rset_control *ct) +static void r_delete (RSET ct) { struct rset_temp_info *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); + xfree (info); } /* r_reread: @@ -278,7 +318,7 @@ static void r_rewind (RSFD rfd) r_reread (rfd); } -static int r_count (struct rset_control *ct) +static int r_count (RSET ct) { struct rset_temp_info *info = ct->buf;