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
Creating search terms, and passing them around in searches. Not yet actually
[idzebra-moved-to-github.git]
/
rset
/
rsisams.c
diff --git
a/rset/rsisams.c
b/rset/rsisams.c
index
e6031e1
..
cd096e0
100644
(file)
--- a/
rset/rsisams.c
+++ b/
rset/rsisams.c
@@
-1,4
+1,4
@@
-/* $Id: rsisams.c,v 1.11 2004-08-31 10:43:39 heikki Exp $
+/* $Id: rsisams.c,v 1.15 2004-10-15 10:07:34 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-25,13
+25,12
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdio.h>
#include <assert.h>
#include <zebrautl.h>
#include <stdio.h>
#include <assert.h>
#include <zebrautl.h>
-#include <rsisams.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);
@@
-41,7
+40,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,
@@
-60,18
+58,15
@@
struct rset_isams_info {
};
};
-RSET rsisams_create( NMEM nmem, int key_size,
- int (*cmp)(const void *p1, const void *p2),
- ISAMS is, ISAMS_P pos)
+RSET rsisams_create( NMEM nmem, const struct key_control *kcontrol, int scope,
+ ISAMS is, ISAMS_P pos, TERMID term)
{
{
- RSET rnew=rset_create_base(&control, nmem);
+ RSET rnew=rset_create_base(&control, nmem, kcontrol, scope, term);
struct rset_isams_info *info;
info = (struct rset_isams_info *) nmem_malloc(rnew->nmem,sizeof(*info));
struct rset_isams_info *info;
info = (struct rset_isams_info *) nmem_malloc(rnew->nmem,sizeof(*info));
- assert(key_size); /* FIXME - these belong to the general rset */
- assert(cmp);
+ rnew->priv=info;
info->is=is;
info->pos=pos;
info->is=is;
info->pos=pos;
- rnew->priv=info;
return rnew;
}
return rnew;
}
@@
-113,17
+108,15
@@
static void r_close (RSFD rfd)
rfd_delete_base(rfd);
}
rfd_delete_base(rfd);
}
-static void r_rewind (RSFD rfd)
-{
- logf (LOG_DEBUG, "rsisams_rewind");
- abort ();
-}
-
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
{
struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv);
{
struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv);
- return isams_pp_read(ptinfo->pt, buf);
+ int rc;
+ rc=isams_pp_read(ptinfo->pt, buf);
+ if (rc && term)
+ *term=rfd->rset->term;
+ return rc;
}
static int r_write (RSFD rfd, const void *buf)
}
static int r_write (RSFD rfd, const void *buf)