-/* $Id: rsisamb.c,v 1.4 2004-01-28 10:44:52 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: rsisamb.c,v 1.20 2004-08-31 14:43:42 heikki Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
This file is part of the Zebra server.
02111-1307, USA.
*/
-
-
-
#include <stdio.h>
#include <assert.h>
#include <zebrautl.h>
#include <rsisamb.h>
#include <string.h>
+#include <../index/index.h> /* for log_keydump. Debugging only */
+
+#ifndef RSET_DEBUG
+#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_count (RSET ct);
-static int r_read (RSFD rfd, void *buf, int *term_index);
+static int r_forward(RSFD rfd, void *buf,
+ int (*cmpfunc)(const void *p1, const void *p2),
+ 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 const struct rset_control control =
{
- "isamc",
- r_create,
+ "isamb",
+ r_delete,
r_open,
r_close,
- r_delete,
r_rewind,
- rset_default_forward,
- r_count,
+ r_forward,
+ r_pos,
r_read,
r_write,
};
struct rset_pp_info {
ISAMB_PP pt;
- struct rset_pp_info *next;
- struct rset_isamb_info *info;
- int *countp;
void *buf;
};
ISAMB_P pos;
int key_size;
int (*cmp)(const void *p1, const void *p2);
- struct rset_pp_info *ispt_list;
};
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
+RSET rsisamb_create( NMEM nmem, int key_size,
+ int (*cmp)(const void *p1, const void *p2),
+ ISAMB is, ISAMB_P pos)
{
- rset_isamb_parms *pt = (rset_isamb_parms *) parms;
+ 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;
+ rnew->priv=info;
+ return rnew;
+}
- 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;
+static void r_delete (RSET ct)
+{
+ logf (LOG_DEBUG, "rsisamb_delete");
}
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;
+ RSFD rfd;
struct rset_pp_info *ptinfo;
- logf (LOG_DEBUG, "risamb_open");
if (flag & RSETF_WRITE)
{
- logf (LOG_FATAL, "ISAMB set type is read-only");
- return NULL;
+ logf (LOG_FATAL, "ISAMB set type is read-only");
+ return NULL;
+ }
+ rfd=rfd_create_base(ct);
+ 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);
+ rfd->priv=ptinfo;
}
- ptinfo = (struct rset_pp_info *) xmalloc (sizeof(*ptinfo));
- ptinfo->next = info->ispt_list;
- 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;
+ return rfd;
}
static void r_close (RSFD rfd)
{
- struct rset_isamb_info *info = ((struct rset_pp_info*) rfd)->info;
- struct rset_pp_info **ptinfop;
-
- for (ptinfop = &info->ispt_list; *ptinfop; ptinfop = &(*ptinfop)->next)
- if (*ptinfop == rfd)
- {
- xfree ((*ptinfop)->buf);
- isamb_pp_close ((*ptinfop)->pt);
- *ptinfop = (*ptinfop)->next;
- xfree (rfd);
- return;
- }
- logf (LOG_FATAL, "r_close but no rfd match!");
- assert (0);
+ struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv);
+ isamb_pp_close (ptinfo->pt);
+ rfd_delete_base(rfd);
}
-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_count (RSET ct)
+static int r_forward(RSFD rfd, void *buf,
+ int (*cmpfunc)(const void *p1, const void *p2),
+ const void *untilbuf)
{
- return 0;
+ struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv);
+ return isamb_pp_forward(pinfo->pt, buf, untilbuf);
}
-static int r_read (RSFD rfd, void *buf, int *term_index)
+static void r_pos (RSFD rfd, double *current, double *total)
{
- 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;
+ struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv);
+ assert(rfd);
+ isamb_pp_pos(pinfo->pt, current, total);
+#if RSET_DEBUG
+ logf(LOG_DEBUG,"isamb.r_pos returning %0.1f/%0.1f",
+ *current, *total);
+#endif
+}
+
+static int r_read (RSFD rfd, void *buf)
+{
+ struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv);
+
+ return isamb_pp_read(pinfo->pt, buf);
}
static int r_write (RSFD rfd, const void *buf)
projects / idzebra-moved-to-github.git / blobdiff