X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frset.c;h=d6e20412c3c998495bd0aa1f9a3f7f5869607fc5;hb=b8844c65622c12fb105bf7fc6bab2fc237af7c14;hp=18b26f7d8a96749bbaa317a7b32deb32f97ea57b;hpb=b879b04a092d5b00cc866cf16f755e55053d2e89;p=idzebra-moved-to-github.git

diff --git a/rset/rset.c b/rset/rset.c
index 18b26f7..d6e2041 100644
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,10 +1,35 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1995, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rset.c,v $
- * Revision 1.2  1995-09-04 12:33:56  adam
+ * 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
+ * New parameter: result-set file descriptor (RSFD) to support multiple
+ * positions within the same result-set.
+ * Boolean operators: and, or, not implemented.
+ *
+ * Revision 1.4  1995/09/06  16:11:56  adam
+ * More work on boolean sets.
+ *
+ * Revision 1.3  1995/09/04  15:20:39  adam
+ * More work on temp sets. is_open member removed.
+ *
+ * Revision 1.2  1995/09/04  12:33:56  adam
  * Various cleanup. YAZ util used instead.
  *
  * Revision 1.1  1994/11/04  13:21:28  quinn
@@ -12,8 +37,6 @@
  *
  */
 
-/* TODO: mem management */
-
 #include <stdio.h>
 #include <alexutil.h>
 
@@ -21,18 +44,18 @@
 
 RSET rset_create(const rset_control *sel, void *parms)
 {
-    RSET new;
+    RSET rnew;
 
-    new = xmalloc(sizeof(*new));     /* make dynamic alloc scheme */
-    if (!(new->control = (*sel->f_create)(sel, parms)))
-    	return 0;
-    return new;
+    logf (LOG_DEBUG, "rs_create(%s)", sel->desc);
+    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)
+void rset_delete (RSET rs)
 {
-    if (rs->is_open)
-    	rset_close(rs);
-    (*rs->control->f_delete)(rs->control);
+    (*rs->control->f_delete)(rs);
     xfree(rs);
 }