/*
- * 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.17 1995-12-11 09:15:28 adam
+ * 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.
#include <fcntl.h>
#include <assert.h>
+#ifdef WINDOWS
+#include <io.h>
+#else
#include <unistd.h>
+#endif
+#include <string.h>
#include <sys/types.h>
#include <stdio.h>
-#include <alexutil.h>
+#include <zebrautl.h>
#include <rstemp.h>
static void *r_create(const struct rset_control *sel, void *parms,
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 =
{
"temp",
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 {
info->pos_end = 0;
info->pos_buf = 0;
info->dirty = 0;
-
- if (!temppath_init)
+ 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;
}
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);
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);
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: