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
/
rsisamb.c
diff --git
a/rset/rsisamb.c
b/rset/rsisamb.c
index
ee0762a
..
305a3d8
100644
(file)
--- a/
rset/rsisamb.c
+++ b/
rset/rsisamb.c
@@
-1,6
+1,6
@@
-/* $Id: rsisamb.c,v 1.26 2004-11-04 13:54:08 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: rsisamb.c,v 1.29 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.
@@
-60,30
+60,30
@@
struct rset_isamb_info {
ISAMB_P pos;
};
ISAMB_P pos;
};
-static int log_level=0;
-static int log_level_initialized=0;
+static int log_level = 0;
+static int log_level_initialized = 0;
RSET rsisamb_create( NMEM nmem, const struct key_control *kcontrol, int scope,
ISAMB is, ISAMB_P pos, TERMID term)
{
RSET rsisamb_create( NMEM nmem, const struct key_control *kcontrol, int scope,
ISAMB is, ISAMB_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_isamb_info *info;
if (!log_level_initialized)
{
struct rset_isamb_info *info;
if (!log_level_initialized)
{
- log_level=yaz_log_module_level("rsisamb");
- log_level_initialized=1;
+ log_level = yaz_log_module_level("rsisamb");
+ log_level_initialized = 1;
}
info = (struct rset_isamb_info *) nmem_malloc(rnew->nmem,sizeof(*info));
}
info = (struct rset_isamb_info *) nmem_malloc(rnew->nmem,sizeof(*info));
- info->is=is;
- info->pos=pos;
- rnew->priv=info;
- logf(log_level,"rsisamb_create");
+ info->is = is;
+ info->pos = pos;
+ rnew->priv = info;
+ yaz_log(log_level,"rsisamb_create");
return rnew;
}
static void r_delete (RSET ct)
{
return rnew;
}
static void r_delete (RSET ct)
{
- logf (log_level, "rsisamb_delete");
+ yaz_log(log_level, "rsisamb_delete");
}
RSFD r_open (RSET ct, int flag)
}
RSFD r_open (RSET ct, int flag)
@@
-94,64
+94,64
@@
RSFD r_open (RSET ct, int flag)
if (flag & RSETF_WRITE)
{
if (flag & RSETF_WRITE)
{
- logf (LOG_FATAL, "ISAMB set type is read-only");
+ yaz_log(YLOG_FATAL, "ISAMB set type is read-only");
return NULL;
}
return NULL;
}
- rfd=rfd_create_base(ct);
+ rfd = rfd_create_base(ct);
if (rfd->priv)
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));
ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size);
else {
ptinfo = (struct rset_pp_info *)nmem_malloc(ct->nmem,sizeof(*ptinfo));
ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size);
- rfd->priv=ptinfo;
+ rfd->priv = ptinfo;
}
ptinfo->pt = isamb_pp_open (info->is, info->pos, ct->scope );
}
ptinfo->pt = isamb_pp_open (info->is, info->pos, ct->scope );
- logf(log_level,"rsisamb_open");
+ yaz_log(log_level,"rsisamb_open");
return rfd;
}
static void r_close (RSFD rfd)
{
return rfd;
}
static void r_close (RSFD rfd)
{
- struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv);
+ struct rset_pp_info *ptinfo = (struct rset_pp_info *)(rfd->priv);
isamb_pp_close (ptinfo->pt);
rfd_delete_base(rfd);
isamb_pp_close (ptinfo->pt);
rfd_delete_base(rfd);
- logf(log_level,"rsisamb_close");
+ yaz_log(log_level,"rsisamb_close");
}
static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf)
{
}
static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf)
{
- struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv);
+ struct rset_pp_info *pinfo = (struct rset_pp_info *)(rfd->priv);
int rc;
int rc;
- rc=isamb_pp_forward(pinfo->pt, buf, untilbuf);
+ rc = isamb_pp_forward(pinfo->pt, buf, untilbuf);
if (rc && term)
if (rc && term)
- *term=rfd->rset->term;
- logf(log_level,"rsisamb_forward");
+ *term = rfd->rset->term;
+ yaz_log(log_level,"rsisamb_forward");
return rc;
}
static void r_pos (RSFD rfd, double *current, double *total)
{
return rc;
}
static void r_pos (RSFD rfd, double *current, double *total)
{
- struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv);
+ struct rset_pp_info *pinfo = (struct rset_pp_info *)(rfd->priv);
assert(rfd);
isamb_pp_pos(pinfo->pt, current, total);
assert(rfd);
isamb_pp_pos(pinfo->pt, current, total);
- logf(log_level,"isamb.r_pos returning %0.1f/%0.1f",
+ yaz_log(log_level,"isamb.r_pos returning %0.1f/%0.1f",
*current, *total);
}
static int r_read (RSFD rfd, void *buf, TERMID *term)
{
*current, *total);
}
static int r_read (RSFD rfd, void *buf, TERMID *term)
{
- struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv);
+ struct rset_pp_info *pinfo = (struct rset_pp_info *)(rfd->priv);
int rc;
int rc;
- rc=isamb_pp_read(pinfo->pt, buf);
+ rc = isamb_pp_read(pinfo->pt, buf);
if (rc && term)
if (rc && term)
- *term=rfd->rset->term;
- logf(log_level,"isamb.r_read ");
+ *term = rfd->rset->term;
+ yaz_log(log_level,"isamb.r_read ");
return rc;
}
static int r_write (RSFD rfd, const void *buf)
{
return rc;
}
static int r_write (RSFD rfd, const void *buf)
{
- logf (LOG_FATAL, "ISAMB set type is read-only");
+ yaz_log(YLOG_FATAL, "ISAMB set type is read-only");
return -1;
}
return -1;
}