-/* $Id: rsisams.c,v 1.5 2004-08-03 12:15:45 heikki Exp $
+/* $Id: rsisams.c,v 1.10 2004-08-24 14:25:16 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <stdio.h>
#include <assert.h>
-#include <rsisams.h>
#include <zebrautl.h>
+#include <rsisams.h>
-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_read (RSFD rfd, void *buf);
static int r_write (RSFD rfd, const void *buf);
static const struct rset_control control =
{
"isams",
- r_create,
r_open,
r_close,
r_delete,
r_rewind,
rset_default_forward,
- /* r_count, */
+ rset_default_pos,
r_read,
r_write,
};
struct rset_pp_info *ispt_list;
};
+
+RSET rsisams_create( NMEM nmem, int key_size,
+ int (*cmp)(const void *p1, const void *p2),
+ ISAMS is, ISAMS_P pos)
+{
+ RSET rnew=rset_create_base(&control, nmem);
+ 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);
+ info->is=is;
+ info->pos=pos;
+ info->ispt_list = NULL;
+ rnew->priv=info;
+ return rnew;
+}
+
+static void r_delete (RSET ct)
+{
+ struct rset_isams_info *info = (struct rset_isams_info *) ct->priv;
+
+ logf (LOG_DEBUG, "rsisams_delete");
+ assert (info->ispt_list == NULL);
+ /* xfree (info); */
+}
+
+#if 0
static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
{
rset_isams_parms *pt = (struct rset_isams_parms *) parms;
struct rset_isams_info *info;
- ct->flags |= RSET_FLAG_VOLATILE;
info = (struct rset_isams_info *) xmalloc (sizeof(*info));
info->is = pt->is;
info->pos = pt->pos;
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_isams_info *info = (struct rset_isams_info *) ct->buf;
+ struct rset_isams_info *info = (struct rset_isams_info *) ct->priv;
struct rset_pp_info *ptinfo;
logf (LOG_DEBUG, "risams_open");
if (flag & RSETF_WRITE)
{
- logf (LOG_FATAL, "ISAMS set type is read-only");
- return NULL;
+ logf (LOG_FATAL, "ISAMS set type is read-only");
+ return NULL;
}
ptinfo = (struct rset_pp_info *) xmalloc (sizeof(*ptinfo));
ptinfo->next = info->ispt_list;
info->ispt_list = ptinfo;
ptinfo->pt = isams_pp_open (info->is, info->pos);
ptinfo->info = info;
- if (ct->rset_terms[0]->nn < 0)
- ct->rset_terms[0]->nn = isams_pp_num (ptinfo->pt);
return ptinfo;
}
assert (0);
}
-static void r_delete (RSET ct)
-{
- struct rset_isams_info *info = (struct rset_isams_info *) ct->buf;
-
- logf (LOG_DEBUG, "rsisams_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)
{
logf (LOG_DEBUG, "rsisams_rewind");
abort ();
}
-/*
-static int r_count (RSET ct)
-{
- return 0;
-}
-*/
-static int r_read (RSFD rfd, void *buf, int *term_index)
+static int r_read (RSFD rfd, void *buf)
{
- *term_index = 0;
return isams_pp_read( ((struct rset_pp_info*) rfd)->pt, buf);
}