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
Fix bug #249: rstemp sets fail. Problem was that rset files were
[idzebra-moved-to-github.git]
/
rset
/
rsisamc.c
diff --git
a/rset/rsisamc.c
b/rset/rsisamc.c
index
7b54d15
..
09a0c29
100644
(file)
--- a/
rset/rsisamc.c
+++ b/
rset/rsisamc.c
@@
-1,6
+1,6
@@
-/* $Id: rsisamc.c,v 1.28 2004-10-22 10:12:52 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: rsisamc.c,v 1.35 2005-01-15 19:38:34 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.
@@
-61,75
+61,87
@@
struct rset_isamc_info {
ISAMC_P pos;
};
ISAMC_P pos;
};
+static int log_level = 0;
+static int log_level_initialized = 0;
+
RSET rsisamc_create( NMEM nmem, const struct key_control *kcontrol, int scope,
ISAMC is, ISAMC_P pos, TERMID term)
{
RSET rsisamc_create( NMEM nmem, const struct key_control *kcontrol, int scope,
ISAMC is, ISAMC_P pos, TERMID term)
{
- RSET rnew=rset_create_base(&control, nmem, kcontrol, scope,term);
+ RSET rnew = rset_create_base(&control, nmem, kcontrol, scope,term);
struct rset_isamc_info *info;
struct rset_isamc_info *info;
+ if (!log_level_initialized)
+ {
+ log_level = yaz_log_module_level("rsisamc");
+ log_level_initialized = 1;
+ }
info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info));
info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info));
- info->is=is;
- info->pos=pos;
- rnew->priv=info;
+ info->is = is;
+ info->pos = pos;
+ rnew->priv = info;
+ yaz_log(log_level, "create: term=%p", term);
return rnew;
}
static void r_delete (RSET ct)
{
return rnew;
}
static void r_delete (RSET ct)
{
- logf (LOG_DEBUG, "rsisamc_delete");
+ yaz_log(log_level, "rsisamc_delete");
}
RSFD r_open (RSET ct, int flag)
{
}
RSFD r_open (RSET ct, int flag)
{
+ struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv;
RSFD rfd;
struct rset_pp_info *ptinfo;
RSFD rfd;
struct rset_pp_info *ptinfo;
- logf (LOG_DEBUG, "risamc_open");
+ yaz_log(log_level, "risamc_open");
if (flag & RSETF_WRITE)
{
if (flag & RSETF_WRITE)
{
- logf (LOG_FATAL, "ISAMC set type is read-only");
+ yaz_log(YLOG_FATAL, "ISAMC set type is read-only");
return NULL;
}
rfd = rfd_create_base(ct);
if (rfd->priv)
return NULL;
}
rfd = rfd_create_base(ct);
if (rfd->priv)
- ptinfo=(struct rset_pp_info *)rfd->priv;
+ ptinfo = (struct rset_pp_info *)rfd->priv;
else {
ptinfo = (struct rset_pp_info *) nmem_malloc (ct->nmem,sizeof(*ptinfo));
else {
ptinfo = (struct rset_pp_info *) nmem_malloc (ct->nmem,sizeof(*ptinfo));
- rfd->priv=ptinfo;
+ rfd->priv = ptinfo;
ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size);
}
ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size);
}
+ ptinfo->pt = isc_pp_open(info->is, info->pos);
return rfd;
}
static void r_close (RSFD rfd)
{
return rfd;
}
static void r_close (RSFD rfd)
{
- struct rset_pp_info *p=(struct rset_pp_info *)(rfd->priv);
+ struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv);
- isc_pp_close (p->pt);
+ isc_pp_close(p->pt);
rfd_delete_base(rfd);
}
static int r_read (RSFD rfd, void *buf, TERMID *term)
{
rfd_delete_base(rfd);
}
static int r_read (RSFD rfd, void *buf, TERMID *term)
{
- struct rset_pp_info *p=(struct rset_pp_info *)(rfd->priv);
+ struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv);
int r;
r = isc_pp_read(p->pt, buf);
if (term)
int r;
r = isc_pp_read(p->pt, buf);
if (term)
- *term=rfd->rset->term;
+ *term = rfd->rset->term;
+ yaz_log(log_level, "isamc.r_read");
return r;
}
static int r_write (RSFD rfd, const void *buf)
{
return r;
}
static int r_write (RSFD rfd, const void *buf)
{
- logf (LOG_FATAL, "ISAMC set type is read-only");
+ yaz_log(YLOG_FATAL, "ISAMC set type is read-only");
return -1;
}
static void r_pos (RSFD rfd, double *current, double *total)
{
return -1;
}
static void r_pos (RSFD rfd, double *current, double *total)
{
- *current=-1; /* sorry, not implemented yet */
- *total=-1;
+ *current = -1; /* sorry, not implemented yet */
+ *total = -1;
}
}