* Sebastian Hammer, Adam Dickmeiss
*
* $Log: rsisam.c,v $
- * Revision 1.12 1995-10-10 14:00:04 adam
+ * Revision 1.17 1997-12-18 10:54:25 adam
+ * New method result set method rs_hits that returns the number of
+ * hits in result-set (if known). The ranked result set returns real
+ * number of hits but only when not combined with other operands.
+ *
+ * Revision 1.16 1997/10/31 12:37:01 adam
+ * Code calls xfree() instead of free().
+ *
+ * Revision 1.15 1996/10/29 13:55:22 adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.14 1995/12/11 09:15:24 adam
+ * New set types: sand/sor/snot - ranked versions of and/or/not in
+ * ranked/semi-ranked result sets.
+ * Note: the snot not finished yet.
+ * New rset member: flag.
+ * Bug fix: r_delete in rsrel.c did free bad memory block.
+ *
+ * Revision 1.13 1995/10/12 12:41:56 adam
+ * Private info (buf) moved from struct rset_control to struct rset.
+ * Bug fixes in relevance.
+ *
+ * Revision 1.12 1995/10/10 14:00:04 adam
* Function rset_open changed its wflag parameter to general flags.
*
* Revision 1.11 1995/10/06 14:38:05 adam
#include <stdio.h>
#include <assert.h>
#include <rsisam.h>
-#include <alexutil.h>
+#include <zebrautl.h>
-static rset_control *r_create(const struct rset_control *sel, void *parms);
-static RSFD r_open (rset_control *ct, int flag);
+static void *r_create(const struct rset_control *sel, void *parms,
+ int *flags);
+static RSFD r_open (RSET ct, int flag);
static void r_close (RSFD rfd);
-static void r_delete (rset_control *ct);
+static void r_delete (RSET ct);
static void r_rewind (RSFD rfd);
-static int r_count (rset_control *ct);
+static int r_count (RSET ct);
+static int r_hits (RSET ct, void *oi);
static int r_read (RSFD rfd, void *buf);
static int r_write (RSFD rfd, const void *buf);
static int r_score (RSFD rfd, int *score);
static const rset_control control =
{
- "ISAM set type",
- 0,
+ "isam",
r_create,
r_open,
r_close,
r_delete,
r_rewind,
r_count,
+ r_hits,
r_read,
r_write,
r_score
struct rset_ispt_info *ispt_list;
};
-static rset_control *r_create(const struct rset_control *sel, void *parms)
+static void *r_create(const struct rset_control *sel, void *parms,
+ int *flags)
{
- rset_control *newct;
rset_isam_parms *pt = parms;
struct rset_isam_info *info;
- newct = xmalloc(sizeof(*newct));
- memcpy(newct, sel, sizeof(*sel));
-
- if (!(newct->buf = xmalloc (sizeof(struct rset_isam_info))))
- return 0;
- info = newct->buf;
+ *flags |= RSET_FLAG_VOLATILE;
+ info = xmalloc (sizeof(struct rset_isam_info));
info->is = pt->is;
info->pos = pt->pos;
info->ispt_list = NULL;
- return newct;
+ return info;
}
-RSFD r_open (rset_control *ct, int flag)
+RSFD r_open (RSET ct, int flag)
{
struct rset_isam_info *info = ct->buf;
struct rset_ispt_info *ptinfo;
{
is_pt_free ((*ptinfop)->pt);
*ptinfop = (*ptinfop)->next;
- free (rfd);
+ xfree (rfd);
return;
}
logf (LOG_FATAL, "r_close but no rfd match!");
assert (0);
}
-static void r_delete (rset_control *ct)
+static void r_delete (RSET ct)
{
struct rset_isam_info *info = ct->buf;
logf (LOG_DEBUG, "rsisam_delete");
assert (info->ispt_list == NULL);
xfree (info);
- xfree (ct);
}
static void r_rewind (RSFD rfd)
is_rewind( ((struct rset_ispt_info*) rfd)->pt);
}
-static int r_count (rset_control *ct)
+static int r_count (RSET ct)
{
return 0;
}
+static int r_hits (RSET ct, void *oi)
+{
+ return -1;
+}
+
static int r_read (RSFD rfd, void *buf)
{
return is_readkey( ((struct rset_ispt_info*) rfd)->pt, buf);