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
Passing a TERMID to rsets when creating, and getting it back when reading.
[idzebra-moved-to-github.git]
/
rset
/
rsisamc.c
diff --git
a/rset/rsisamc.c
b/rset/rsisamc.c
index
126066e
..
4e8b827
100644
(file)
--- a/
rset/rsisamc.c
+++ b/
rset/rsisamc.c
@@
-1,4
+1,4
@@
-/* $Id: rsisamc.c,v 1.23 2004-08-31 10:43:39 heikki Exp $
+/* $Id: rsisamc.c,v 1.27 2004-10-15 10:07:34 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-27,13
+27,12
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <assert.h>
#include <string.h>
#include <zebrautl.h>
#include <assert.h>
#include <string.h>
#include <zebrautl.h>
-#include <rsisamc.h>
+#include <rset.h>
static RSFD r_open (RSET ct, int flag);
static void r_close (RSFD rfd);
static void r_delete (RSET ct);
static RSFD r_open (RSET ct, int flag);
static void r_close (RSFD rfd);
static void r_delete (RSET ct);
-static void r_rewind (RSFD rfd);
-static int r_read (RSFD rfd, void *buf);
+static int r_read (RSFD rfd, void *buf, TERMID *term);
static int r_write (RSFD rfd, const void *buf);
static void r_pos (RSFD rfd, double *current, double *total);
static int r_write (RSFD rfd, const void *buf);
static void r_pos (RSFD rfd, double *current, double *total);
@@
-43,7
+42,6
@@
static const struct rset_control control =
r_delete,
r_open,
r_close,
r_delete,
r_open,
r_close,
- r_rewind,
rset_default_forward,
r_pos,
r_read,
rset_default_forward,
r_pos,
r_read,
@@
-54,31
+52,20
@@
const struct rset_control *rset_kind_isamc = &control;
struct rset_pp_info {
ISAMC_PP pt;
struct rset_pp_info {
ISAMC_PP pt;
- struct rset_pp_info *next;
- struct rset_isamc_info *info;
void *buf;
};
struct rset_isamc_info {
ISAMC is;
ISAMC_P pos;
void *buf;
};
struct rset_isamc_info {
ISAMC is;
ISAMC_P pos;
- int key_size;
- int (*cmp)(const void *p1, const void *p2);
- struct rset_pp_info *ispt_list;
- struct rset_pp_info *free_list;
};
};
-RSET rsisamc_create( NMEM nmem, int key_size,
- int (*cmp)(const void *p1, const void *p2),
- ISAMC is, ISAMC_P pos)
+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);
+ RSET rnew=rset_create_base(&control, nmem, kcontrol, scope,term);
struct rset_isamc_info *info;
info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info));
struct rset_isamc_info *info;
info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info));
- info->key_size = key_size;
- info->cmp = cmp;
- info->ispt_list = NULL;
- info->free_list = NULL;
info->is=is;
info->pos=pos;
rnew->priv=info;
info->is=is;
info->pos=pos;
rnew->priv=info;
@@
-87,16
+74,12
@@
RSET rsisamc_create( NMEM nmem, int key_size,
static void r_delete (RSET ct)
{
static void r_delete (RSET ct)
{
- struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv;
-
logf (LOG_DEBUG, "rsisamc_delete");
logf (LOG_DEBUG, "rsisamc_delete");
- assert (info->ispt_list == NULL);
}
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;
@@
-112,7
+95,7
@@
RSFD r_open (RSET ct, int flag)
else {
ptinfo = (struct rset_pp_info *) nmem_malloc (ct->nmem,sizeof(*ptinfo));
rfd->priv=ptinfo;
else {
ptinfo = (struct rset_pp_info *) nmem_malloc (ct->nmem,sizeof(*ptinfo));
rfd->priv=ptinfo;
- ptinfo->buf = nmem_malloc (ct->nmem,info->key_size);
+ ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size);
}
return rfd;
}
}
return rfd;
}
@@
-126,17
+109,13
@@
static void r_close (RSFD rfd)
}
}
-static void r_rewind (RSFD rfd)
-{
- logf (LOG_DEBUG, "rsisamc_rewind");
- abort ();
-}
-
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
{
struct rset_pp_info *p=(struct rset_pp_info *)(rfd->priv);
int r;
r = isc_pp_read(p->pt, buf);
{
struct rset_pp_info *p=(struct rset_pp_info *)(rfd->priv);
int r;
r = isc_pp_read(p->pt, buf);
+ if (term)
+ *term=rfd->rset->term;
return r;
}
return r;
}
@@
-151,3
+130,4
@@
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;
}
+