projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assume PID file has been created just after server has started
[idzebra-moved-to-github.git]
/
rset
/
rstemp.c
diff --git
a/rset/rstemp.c
b/rset/rstemp.c
index
621addf
..
b492f0e
100644
(file)
--- a/
rset/rstemp.c
+++ b/
rset/rstemp.c
@@
-1,4
+1,4
@@
-/* $Id: rstemp.c,v 1.52 2004-10-22 10:12:52 heikki Exp $
+/* $Id: rstemp.c,v 1.55 2004-11-19 10:27:14 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
@@
-48,7
+48,7
@@
static const struct rset_control control =
{
"temp",
r_delete,
{
"temp",
r_delete,
- rset_get_no_terms,
+ rset_get_one_term,
r_open,
r_close,
rset_default_forward,
r_open,
r_close,
rset_default_forward,
@@
-79,13
+79,20
@@
struct rset_temp_rfd {
zint cur; /* number of the current hit */
};
zint cur; /* number of the current hit */
};
+static int log_level=0;
+static int log_level_initialized=0;
+
RSET rstemp_create( NMEM nmem, const struct key_control *kcontrol,
int scope,
RSET rstemp_create( NMEM nmem, const struct key_control *kcontrol,
int scope,
- const char *temp_path)
+ const char *temp_path,TERMID term)
{
{
- RSET rnew=rset_create_base(&control, nmem, kcontrol, scope,0);
+ RSET rnew=rset_create_base(&control, nmem, kcontrol, scope,term);
struct rset_temp_info *info;
struct rset_temp_info *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->fd = -1;
info->fname = NULL;
info = (struct rset_temp_info *) nmem_malloc(rnew->nmem, sizeof(*info));
info->fd = -1;
info->fname = NULL;
@@
-108,10
+115,10
@@
static void r_delete (RSET ct)
{
struct rset_temp_info *info = (struct rset_temp_info*) ct->priv;
{
struct rset_temp_info *info = (struct rset_temp_info*) ct->priv;
- logf (LOG_DEBUG, "r_delete: set size %ld", (long) info->pos_end);
+ yaz_log (log_level, "r_delete: set size %ld", (long) info->pos_end);
if (info->fname)
{
if (info->fname)
{
- logf (LOG_DEBUG, "r_delete: unlink %s", info->fname);
+ yaz_log (log_level, "r_delete: unlink %s", info->fname);
unlink (info->fname);
}
}
unlink (info->fname);
}
}
@@
-131,7
+138,7
@@
static RSFD r_open (RSET ct, int flag)
info->fd = open (info->fname, O_BINARY|O_RDONLY);
if (info->fd == -1)
{
info->fd = open (info->fname, O_BINARY|O_RDONLY);
if (info->fd == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "open %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: open failed %s", info->fname);
exit (1);
}
}
exit (1);
}
}
@@
-172,7
+179,7
@@
static void r_flush (RSFD rfd, int mk)
if (info->fd == -1)
{
if (info->fd == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "mkstemp %s", template);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: mkstemp %s", template);
exit (1);
}
info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1);
exit (1);
}
info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1);
@@
-182,11
+189,11
@@
static void r_flush (RSFD rfd, int mk)
info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1);
strcpy (info->fname, s);
info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1);
strcpy (info->fname, s);
- logf (LOG_DEBUG, "creating tempfile %s", info->fname);
+ yaz_log (log_level, "creating tempfile %s", info->fname);
info->fd = open (info->fname, O_BINARY|O_RDWR|O_CREAT, 0666);
if (info->fd == -1)
{
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);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: open %s", info->fname);
exit (1);
}
#endif
exit (1);
}
#endif
@@
-198,7
+205,7
@@
static void r_flush (RSFD rfd, int mk)
if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
{
if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "lseek %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek %s", info->fname);
exit (1);
}
count = info->buf_size;
exit (1);
}
count = info->buf_size;
@@
-207,9
+214,9
@@
static void r_flush (RSFD rfd, int mk)
if ((r = write (info->fd, info->buf_mem, count)) < (int) count)
{
if (r == -1)
if ((r = write (info->fd, info->buf_mem, count)) < (int) count)
{
if (r == -1)
- logf (LOG_FATAL|LOG_ERRNO, "read %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: write %s", info->fname);
else
else
- logf (LOG_FATAL, "write of %ld but got %ld",
+ yaz_log (YLOG_FATAL, "rstemp: write of %ld but got %ld",
(long) count, (long) r);
exit (1);
}
(long) count, (long) r);
exit (1);
}
@@
-254,15
+261,15
@@
static void r_reread (RSFD rfd)
{
if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
{
{
if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "lseek %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek %s", info->fname);
exit (1);
}
if ((r = read (info->fd, info->buf_mem, count)) < (int) count)
{
if (r == -1)
exit (1);
}
if ((r = read (info->fd, info->buf_mem, count)) < (int) count)
{
if (r == -1)
- logf (LOG_FATAL|LOG_ERRNO, "read %s", info->fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: read %s", info->fname);
else
else
- logf (LOG_FATAL, "read of %ld but got %ld",
+ yaz_log (YLOG_FATAL, "read of %ld but got %ld",
(long) count, (long) r);
exit (1);
}
(long) count, (long) r);
exit (1);
}