-/* $Id: rstemp.c,v 1.62 2005-04-26 10:09:38 adam Exp $
- Copyright (C) 1995-2005
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2011 Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <assert.h>
#include <string.h>
#ifdef WIN32
#include <io.h>
-#else
+#endif
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <sys/types.h>
rset_get_one_term,
r_open,
r_close,
- rset_default_forward,
+ 0, /* no forward */
r_pos,
r_read,
r_write,
};
-struct rset_temp_info {
+struct rset_private {
int fd; /* file descriptor for temp file */
char *fname; /* name of temp file */
char *buf_mem; /* window buffer */
char *temp_path;
};
-struct rset_temp_rfd {
+struct rfd_private {
void *buf;
size_t pos_cur; /* current position in set */
/* FIXME - term pos or what ?? */
static int log_level = 0;
static int log_level_initialized = 0;
-RSET rstemp_create(NMEM nmem, const struct key_control *kcontrol,
- int scope, const char *temp_path, TERMID term)
+RSET rset_create_temp(NMEM nmem, struct rset_key_control *kcontrol,
+ int scope, const char *temp_path, TERMID term)
{
- RSET rnew = rset_create_base(&control, nmem, kcontrol, scope,term);
- struct rset_temp_info *info;
+ RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term,
+ 0, 0);
+ struct rset_private *info;
if (!log_level_initialized)
{
log_level = yaz_log_module_level("rstemp");
log_level_initialized = 1;
}
- info = (struct rset_temp_info *) nmem_malloc(rnew->nmem, sizeof(*info));
+ info = (struct rset_private *) nmem_malloc(rnew->nmem, sizeof(*info));
info->fd = -1;
info->fname = NULL;
info->buf_size = 4096;
static void r_delete(RSET ct)
{
- struct rset_temp_info *info = (struct rset_temp_info*) ct->priv;
+ struct rset_private *info = (struct rset_private*) ct->priv;
yaz_log(log_level, "r_delete: set size %ld", (long) info->pos_end);
if (info->fname)
static RSFD r_open(RSET ct, int flag)
{
- struct rset_temp_info *info = (struct rset_temp_info *) ct->priv;
+ struct rset_private *info = (struct rset_private *) ct->priv;
RSFD rfd;
- struct rset_temp_rfd *prfd;
+ struct rfd_private *prfd;
if (info->fd == -1 && info->fname)
{
if (info->fd == -1)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open failed %s", info->fname);
- exit(1);
+ zebra_exit("r_open");
}
}
rfd = rfd_create_base(ct);
if (!rfd->priv)
{
- prfd = (struct rset_temp_rfd *) nmem_malloc(ct->nmem, sizeof(*prfd));
+ prfd = (struct rfd_private *) nmem_malloc(ct->nmem, sizeof(*prfd));
rfd->priv = (void *)prfd;
prfd->buf = nmem_malloc(ct->nmem,ct->keycontrol->key_size);
}
*/
static void r_flush(RSFD rfd, int mk)
{
- /* struct rset_temp_info *info = ((struct rset_temp_rfd*) rfd)->info; */
- struct rset_temp_info *info = rfd->rset->priv;
+ struct rset_private *info = rfd->rset->priv;
if (!info->fname && mk)
{
#if HAVE_MKSTEMP
char template[1024];
+
+ *template = '\0';
+
if (info->temp_path)
- sprintf(template, "%s/zrsXXXXXX", info->temp_path);
- else
- sprintf(template, "zrsXXXXXX");
+ sprintf(template, "%s/", info->temp_path);
+ strcat(template, "zrs_");
+#if HAVE_UNISTD_H
+ sprintf(template + strlen(template), "%ld_", (long) getpid());
+#endif
+ strcat(template, "XXXXXX");
info->fd = mkstemp(template);
-
if (info->fd == -1)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: mkstemp %s", template);
- exit(1);
+ zebra_exit("r_flush");
}
info->fname = nmem_strdup(rfd->rset->nmem, template);
#else
if (info->fd == -1)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open %s", info->fname);
- exit(1);
+ zebra_exit("r_flush");
}
#endif
}
if (lseek(info->fd, info->pos_buf, SEEK_SET) == -1)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek (1) %s", info->fname);
- exit(1);
+ zebra_exit("r_flusxh");
}
count = info->buf_size;
if (count > info->pos_end - info->pos_buf)
else
yaz_log(YLOG_FATAL, "rstemp: write of %ld but got %ld",
(long) count, (long) r);
- exit(1);
+ zebra_exit("r_flush");
}
info->dirty = 0;
}
static void r_close(RSFD rfd)
{
- /*struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv; */
- struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv;
+ struct rset_private *info = (struct rset_private *)rfd->rset->priv;
if (rfd_is_last(rfd))
{
r_flush(rfd, 0);
info->fd = -1;
}
}
- rfd_delete_base(rfd);
}
*/
static void r_reread(RSFD rfd)
{
- struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv;
- struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv;
+ struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
+ struct rset_private *info = (struct rset_private *)rfd->rset->priv;
if (info->fname)
{
if (lseek(info->fd, info->pos_buf, SEEK_SET) == -1)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek (2) %s fd=%d", info->fname, info->fd);
- exit(1);
+ zebra_exit("r_reread");
}
if ((r = read(info->fd, info->buf_mem, count)) < (int) count)
{
else
yaz_log(YLOG_FATAL, "read of %ld but got %ld",
(long) count, (long) r);
- exit(1);
+ zebra_exit("r_reread");
}
}
}
static int r_read(RSFD rfd, void *buf, TERMID *term)
{
- struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv;
- struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv;
+ struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
+ struct rset_private *info = (struct rset_private *)rfd->rset->priv;
size_t nc = mrfd->pos_cur + rfd->rset->keycontrol->key_size;
static int r_write(RSFD rfd, const void *buf)
{
- struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv;
- struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv;
+ struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
+ struct rset_private *info = (struct rset_private *)rfd->rset->priv;
size_t nc = mrfd->pos_cur + rfd->rset->keycontrol->key_size;
static void r_pos(RSFD rfd, double *current, double *total)
{
- /* struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd; */
- struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv;
- struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv;
+ struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
+ struct rset_private *info = (struct rset_private *)rfd->rset->priv;
*current = (double) mrfd->cur;
*total = (double) info->hits;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / idzebra-moved-to-github.git / blobdiff