* Sebastian Hammer, Adam Dickmeiss
*
* $Log: rsbool.c,v $
- * Revision 1.5 1995-09-08 14:52:41 adam
+ * Revision 1.13 1997-12-18 10:54:24 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.12 1997/10/31 12:37:01 adam
+ * Code calls xfree() instead of free().
+ *
+ * Revision 1.11 1997/09/09 13:38:15 adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.10 1996/10/29 13:55:20 adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.9 1995/12/11 09:15:22 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.8 1995/10/12 12:41:55 adam
+ * Private info (buf) moved from struct rset_control to struct rset.
+ * Bug fixes in relevance.
+ *
+ * Revision 1.7 1995/10/10 14:00:03 adam
+ * Function rset_open changed its wflag parameter to general flags.
+ *
+ * Revision 1.6 1995/10/06 14:38:05 adam
+ * New result set method: r_score.
+ * Local no (sysno) and score is transferred to retrieveCtrl.
+ *
+ * Revision 1.5 1995/09/08 14:52:41 adam
* Work on relevance feedback.
*
* Revision 1.4 1995/09/08 08:54:04 adam
*/
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <assert.h>
#include <rsbool.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 wflag);
+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_and (RSFD rfd, void *buf);
static int r_read_or (RSFD rfd, void *buf);
static int r_read_not (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_and =
{
- "AND set type",
- 0,
+ "and",
r_create,
r_open,
r_close,
r_delete,
r_rewind,
r_count,
+ r_hits,
r_read_and,
- r_write
+ r_write,
+ r_score
};
static const rset_control control_or =
{
- "OR set type",
- 0,
+ "or",
r_create,
r_open,
r_close,
r_delete,
r_rewind,
r_count,
+ r_hits,
r_read_or,
- r_write
+ r_write,
+ r_score
};
static const rset_control control_not =
{
- "NOT set type",
- 0,
+ "not",
r_create,
r_open,
r_close,
r_delete,
r_rewind,
r_count,
+ r_hits,
r_read_not,
- r_write
+ r_write,
+ r_score
};
struct rset_bool_info *info;
};
-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_bool_parms *bool_parms = parms;
struct rset_bool_info *info;
- newct = xmalloc(sizeof(*newct));
- memcpy (newct, sel, sizeof(*sel));
- newct->buf = xmalloc (sizeof(struct rset_bool_info));
- info = (struct rset_bool_info*) newct->buf;
+ info = xmalloc (sizeof(*info));
info->key_size = bool_parms->key_size;
info->rset_l = bool_parms->rset_l;
info->rset_r = bool_parms->rset_r;
+ if (rset_is_volatile(info->rset_l) || rset_is_volatile(info->rset_r))
+ *flags |= RSET_FLAG_VOLATILE;
info->cmp = bool_parms->cmp;
info->rfd_list = NULL;
- return newct;
+ return info;
}
-static RSFD r_open (rset_control *ct, int wflag)
+static RSFD r_open (RSET ct, int flag)
{
struct rset_bool_info *info = ct->buf;
struct rset_bool_rfd *rfd;
- if (wflag)
+ if (flag & RSETF_WRITE)
{
logf (LOG_FATAL, "bool set type is read-only");
return NULL;
rfd = xmalloc (sizeof(*rfd));
rfd->next = info->rfd_list;
info->rfd_list = rfd;
+ rfd->info = info;
rfd->buf_l = xmalloc (info->key_size);
rfd->buf_r = xmalloc (info->key_size);
- rfd->rfd_l = rset_open (info->rset_l, wflag);
- rfd->rfd_r = rset_open (info->rset_r, wflag);
+ rfd->rfd_l = rset_open (info->rset_l, RSETF_READ|RSETF_SORT_SYSNO);
+ rfd->rfd_r = rset_open (info->rset_r, RSETF_READ|RSETF_SORT_SYSNO);
rfd->more_l = rset_read (info->rset_l, rfd->rfd_l, rfd->buf_l);
rfd->more_r = rset_read (info->rset_r, rfd->rfd_r, rfd->buf_r);
- rfd->info = info;
return rfd;
}
rset_close (info->rset_l, (*rfdp)->rfd_l);
rset_close (info->rset_r, (*rfdp)->rfd_r);
*rfdp = (*rfdp)->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_bool_info *info = ct->buf;
assert (info->rfd_list == NULL);
+ rset_delete (info->rset_l);
+ rset_delete (info->rset_r);
xfree (info);
- xfree (ct);
}
static void r_rewind (RSFD rfd)
p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r);
}
-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_and (RSFD rfd, void *buf)
{
struct rset_bool_rfd *p = rfd;
logf (LOG_FATAL, "bool set type is read-only");
return -1;
}
+
+static int r_score (RSFD rfd, int *score)
+{
+ *score = -1;
+ return -1;
+}
+
projects / idzebra-moved-to-github.git / blobdiff