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 sh script to run a test
[idzebra-moved-to-github.git]
/
rset
/
rsisamb.c
diff --git
a/rset/rsisamb.c
b/rset/rsisamb.c
index
e39ac6b
..
cd16cba
100644
(file)
--- a/
rset/rsisamb.c
+++ b/
rset/rsisamb.c
@@
-1,4
+1,4
@@
-/* $Id: rsisamb.c,v 1.19 2004-08-31 10:43:39 heikki Exp $
+/* $Id: rsisamb.c,v 1.22 2004-09-09 10:08:06 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
@@
-23,9
+23,8
@@
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 <rsisamb.h>
+#include <rset.h>
#include <string.h>
#include <string.h>
-#include <../index/index.h> /* for log_keydump. Debugging only */
#ifndef RSET_DEBUG
#define RSET_DEBUG 0
#ifndef RSET_DEBUG
#define RSET_DEBUG 0
@@
-35,9
+34,7
@@
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 void r_close (RSFD rfd);
static void r_delete (RSET ct);
static void r_rewind (RSFD rfd);
-static int r_forward(RSFD rfd, void *buf,
- int (*cmpfunc)(const void *p1, const void *p2),
- const void *untilbuf);
+static int r_forward(RSFD rfd, void *buf, const void *untilbuf);
static void r_pos (RSFD rfd, double *current, double *total);
static int r_read (RSFD rfd, void *buf);
static int r_write (RSFD rfd, const void *buf);
static void r_pos (RSFD rfd, double *current, double *total);
static int r_read (RSFD rfd, void *buf);
static int r_write (RSFD rfd, const void *buf);
@@
-49,7
+46,7
@@
static const struct rset_control control =
r_open,
r_close,
r_rewind,
r_open,
r_close,
r_rewind,
- r_forward, /* rset_default_forward, */
+ r_forward,
r_pos,
r_read,
r_write,
r_pos,
r_read,
r_write,
@@
-65,19
+62,14
@@
struct rset_pp_info {
struct rset_isamb_info {
ISAMB is;
ISAMB_P pos;
struct rset_isamb_info {
ISAMB is;
ISAMB_P pos;
- int key_size;
- int (*cmp)(const void *p1, const void *p2);
};
};
-RSET rsisamb_create( NMEM nmem, int key_size,
- int (*cmp)(const void *p1, const void *p2),
+RSET rsisamb_create( NMEM nmem, const struct key_control *kcontrol, int scope,
ISAMB is, ISAMB_P pos)
{
ISAMB is, ISAMB_P pos)
{
- RSET rnew=rset_create_base(&control, nmem);
+ RSET rnew=rset_create_base(&control, nmem, kcontrol, scope);
struct rset_isamb_info *info;
info = (struct rset_isamb_info *) nmem_malloc(rnew->nmem,sizeof(*info));
struct rset_isamb_info *info;
info = (struct rset_isamb_info *) nmem_malloc(rnew->nmem,sizeof(*info));
- info->key_size = key_size;
- info->cmp = cmp;
info->is=is;
info->pos=pos;
rnew->priv=info;
info->is=is;
info->pos=pos;
rnew->priv=info;
@@
-104,11
+96,11
@@
RSFD r_open (RSET ct, int flag)
if (rfd->priv)
ptinfo=(struct rset_pp_info *) (rfd->priv);
else {
if (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,info->key_size);
+ 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);
+ ptinfo->pt = isamb_pp_open (info->is, info->pos, ct->scope );
return rfd;
}
return rfd;
}
@@
-126,9
+118,7
@@
static void r_rewind (RSFD rfd)
abort ();
}
abort ();
}
-static int r_forward(RSFD rfd, void *buf,
- int (*cmpfunc)(const void *p1, const void *p2),
- const void *untilbuf)
+static int r_forward(RSFD rfd, void *buf, const void *untilbuf)
{
struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv);
return isamb_pp_forward(pinfo->pt, buf, untilbuf);
{
struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv);
return isamb_pp_forward(pinfo->pt, buf, untilbuf);