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
Added a missing config file
[idzebra-moved-to-github.git]
/
rset
/
rsisamc.c
diff --git
a/rset/rsisamc.c
b/rset/rsisamc.c
index
5761a9b
..
7b54d15
100644
(file)
--- a/
rset/rsisamc.c
+++ b/
rset/rsisamc.c
@@
-1,4
+1,4
@@
-/* $Id: rsisamc.c,v 1.24 2004-09-01 15:01:32 heikki Exp $
+/* $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
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-32,8
+32,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
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);
@@
-41,9
+40,9
@@
static const struct rset_control control =
{
"isamc",
r_delete,
{
"isamc",
r_delete,
+ rset_get_one_term,
r_open,
r_close,
r_open,
r_close,
- r_rewind,
rset_default_forward,
r_pos,
r_read,
rset_default_forward,
r_pos,
r_read,
@@
-62,10
+61,10
@@
struct rset_isamc_info {
ISAMC_P pos;
};
ISAMC_P pos;
};
-RSET rsisamc_create( NMEM nmem, const struct key_control *kcontrol,
- 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, kcontrol);
+ 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));
info->is=is;
struct rset_isamc_info *info;
info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info));
info->is=is;
@@
-111,17
+110,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;
}
@@
-137,3
+132,5
@@
static void r_pos (RSFD rfd, double *current, double *total)
*total=-1;
}
*total=-1;
}
+
+