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
Make a copy of ord(inals) in rset_term_create.
[idzebra-moved-to-github.git]
/
rset
/
rsisamc.c
diff --git
a/rset/rsisamc.c
b/rset/rsisamc.c
index
fd56592
..
b0c9201
100644
(file)
--- a/
rset/rsisamc.c
+++ b/
rset/rsisamc.c
@@
-1,6
+1,6
@@
-/* $Id: rsisamc.c,v 1.31 2004-11-15 23:09:36 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: rsisamc.c,v 1.40 2005-05-24 11:35:43 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.
@@
-20,13
+20,10
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-
-
-
#include <stdio.h>
#include <assert.h>
#include <string.h>
#include <stdio.h>
#include <assert.h>
#include <string.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
#include <rset.h>
static RSFD r_open (RSET ct, int flag);
#include <rset.h>
static RSFD r_open (RSET ct, int flag);
@@
-43,14
+40,12
@@
static const struct rset_control control =
rset_get_one_term,
r_open,
r_close,
rset_get_one_term,
r_open,
r_close,
- rset_default_forward,
+ 0, /* no forward */
r_pos,
r_read,
r_write,
};
r_pos,
r_read,
r_write,
};
-const struct rset_control *rset_kind_isamc = &control;
-
struct rset_pp_info {
ISAMC_PP pt;
void *buf;
struct rset_pp_info {
ISAMC_PP pt;
void *buf;
@@
-58,33
+53,34
@@
struct rset_pp_info {
struct rset_isamc_info {
ISAMC is;
struct rset_isamc_info {
ISAMC is;
- ISAMC_P pos;
+ ISAM_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 rsisamc_create( NMEM nmem, const struct key_control *kcontrol, int scope,
- ISAMC is, ISAMC_P pos, TERMID term)
+RSET rsisamc_create(NMEM nmem, struct rset_key_control *kcontrol,
+ int scope,
+ ISAMC is, ISAM_P pos, TERMID term)
{
{
- RSET rnew=rset_create_base(&control, nmem, kcontrol, scope,term);
+ RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term, 0, 0);
struct rset_isamc_info *info;
if (!log_level_initialized)
{
struct rset_isamc_info *info;
if (!log_level_initialized)
{
- log_level=yaz_log_module_level("rsisamc");
- log_level_initialized=1;
+ 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;
- logf(log_level, "create: term=%p", term);
+ 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_level, "rsisamc_delete");
+ yaz_log(log_level, "rsisamc_delete");
}
}
@@
-94,54
+90,53
@@
RSFD r_open (RSET ct, int flag)
RSFD rfd;
struct rset_pp_info *ptinfo;
RSFD rfd;
struct rset_pp_info *ptinfo;
- logf (log_level, "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);
+ ptinfo->pt = isamc_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);
- rfd_delete_base(rfd);
+ isamc_pp_close(p->pt);
}
static int r_read (RSFD rfd, void *buf, TERMID *term)
{
}
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;
int r;
- r = isc_pp_read(p->pt, buf);
+ r = isamc_pp_read(p->pt, buf);
if (term)
if (term)
- *term=rfd->rset->term;
- logf(log_level,"read returning term %p", *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;
}
}