Using oid_ent_to_oid used instead of the non thread-safe oid_getoidbyent.

[idzebra-moved-to-github.git] / rset / rset.c

diff --git a/rset/rset.c b/rset/rset.c
index 0776cb2..b86b981 100644 (file)
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -4,7 +4,21 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rset.c,v $
- * Revision 1.6  1995-09-08 14:52:41  adam
+ * Revision 1.9  1996-10-29 13:55:21  adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.8  1995/12/11 09:15:23  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.7  1995/10/12  12:41:56  adam
+ * Private info (buf) moved from struct rset_control to struct rset.
+ * Bug fixes in relevance.
+ *
+ * Revision 1.6  1995/09/08  14:52:41  adam
  * Work on relevance feedback.
  *
  * Revision 1.5  1995/09/07  13:58:43  adam
@@ -27,23 +41,24 @@
  */
 
 #include <stdio.h>
-#include <alexutil.h>
+#include <zebrautl.h>
 
 #include <rset.h>
 
 RSET rset_create(const rset_control *sel, void *parms)
 {
-    RSET new;
+    RSET rnew;
 
     logf (LOG_DEBUG, "rs_create(%s)", sel->desc);
-    new = xmalloc(sizeof(*new));     /* make dynamic alloc scheme */
-    if (!(new->control = (*sel->f_create)(sel, parms)))
-       return 0;
-    return new;
+    rnew = xmalloc(sizeof(*rnew));
+    rnew->control = sel;
+    rnew->flags = 0;
+    rnew->buf = (*sel->f_create)(sel, parms, &rnew->flags);
+    return rnew;
 }
 
 void rset_delete (RSET rs)
 {
-    (*rs->control->f_delete)(rs->control);
+    (*rs->control->f_delete)(rs);
     xfree(rs);
 }