-/* $Id: rsisamb.c,v 1.12 2004-08-06 09:43:04 heikki Exp $
+/* $Id: rsisamb.c,v 1.17 2004-08-24 14:25:16 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#define RSET_DEBUG 0
#endif
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
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_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
+static int r_forward(RSET ct, RSFD rfd, void *buf,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf);
-static void r_pos (RSFD rfd, zint *current, zint *total);
-static int r_read (RSFD rfd, void *buf, int *term_index);
+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 const struct rset_control control =
{
"isamb",
- r_create,
r_open,
r_close,
r_delete,
ISAMB_PP pt;
struct rset_pp_info *next;
struct rset_isamb_info *info;
- int *countp;
void *buf;
};
struct rset_pp_info *ispt_list;
};
+RSET rsisamb_create( NMEM nmem, int key_size,
+ int (*cmp)(const void *p1, const void *p2),
+ ISAMB is, ISAMB_P pos)
+{
+ RSET rnew=rset_create_base(&control, nmem);
+ 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;
+ info->ispt_list = NULL;
+ rnew->priv=info;
+ return rnew;
+}
+
+static void r_delete (RSET ct)
+{
+ struct rset_isamb_info *info = (struct rset_isamb_info *) ct->priv;
+
+ logf (LOG_DEBUG, "rsisamb_delete");
+ assert (info->ispt_list == NULL);
+}
+
+#if 0
static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
{
rset_isamb_parms *pt = (rset_isamb_parms *) parms;
struct rset_isamb_info *info;
- ct->flags |= RSET_FLAG_VOLATILE;
info = (struct rset_isamb_info *) xmalloc (sizeof(*info));
info->is = pt->is;
info->pos = pt->pos;
info->key_size = pt->key_size;
info->cmp = pt->cmp;
info->ispt_list = NULL;
- ct->no_rset_terms = 1;
- ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
- ct->rset_terms[0] = pt->rset_term;
return info;
}
+#endif
RSFD r_open (RSET ct, int flag)
{
- struct rset_isamb_info *info = (struct rset_isamb_info *) ct->buf;
+ struct rset_isamb_info *info = (struct rset_isamb_info *) ct->priv;
struct rset_pp_info *ptinfo;
logf (LOG_DEBUG, "risamb_open");
info->ispt_list = ptinfo;
ptinfo->pt = isamb_pp_open (info->is, info->pos);
ptinfo->info = info;
- if (ct->rset_terms[0]->nn < 0)
- ct->rset_terms[0]->nn = isamb_pp_num (ptinfo->pt);
- ct->rset_terms[0]->count = 0;
- ptinfo->countp = &ct->rset_terms[0]->count;
ptinfo->buf = xmalloc (info->key_size);
return ptinfo;
}
assert (0);
}
-static void r_delete (RSET ct)
-{
- struct rset_isamb_info *info = (struct rset_isamb_info *) ct->buf;
-
- logf (LOG_DEBUG, "rsisamb_delete");
- assert (info->ispt_list == NULL);
- rset_term_destroy (ct->rset_terms[0]);
- xfree (ct->rset_terms);
- xfree (info);
-}
static void r_rewind (RSFD rfd)
{
abort ();
}
-static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
+static int r_forward(RSET ct, RSFD rfd, void *buf,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf)
{
return i;
}
-static void r_pos (RSFD rfd, zint *current, zint *total)
+static void r_pos (RSFD rfd, double *current, double *total)
{
struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
assert(rfd);
isamb_pp_pos(pinfo->pt, current, total);
#if RSET_DEBUG
- logf(LOG_DEBUG,"isamb.r_pos returning "ZINT_FORMAT"/"ZINT_FORMAT,
+ logf(LOG_DEBUG,"isamb.r_pos returning %0.1f/%0.1f",
*current, *total);
#endif
}
-static int r_read (RSFD rfd, void *buf, int *term_index)
+static int r_read (RSFD rfd, void *buf)
{
struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
int r;
- *term_index = 0;
r = isamb_pp_read(pinfo->pt, buf);
- if (r > 0)
- {
- if (*pinfo->countp == 0 || (*pinfo->info->cmp)(buf, pinfo->buf) > 1)
- {
- memcpy (pinfo->buf, buf, pinfo->info->key_size);
- (*pinfo->countp)++;
- }
- }
return r;
}