X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsnull.c;h=fd98d300dfed3589852dfa67be31d3d4371e4e74;hb=85df66537199c30a492ad54be4fbe25fa77e18c8;hp=136617fda888bde7f27b5b97e1f890dfa43664af;hpb=40ca1d08c1d83b92e0b90951d918b252c61c63b2;p=idzebra-moved-to-github.git

diff --git a/rset/rsnull.c b/rset/rsnull.c
index 136617f..fd98d30 100644
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -4,7 +4,21 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsnull.c,v $
- * Revision 1.4  1995-10-06 14:38:06  adam
+ * Revision 1.7  1995-12-11 09:15:25  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.6  1995/10/12  12:41:57  adam
+ * Private info (buf) moved from struct rset_control to struct rset.
+ * Bug fixes in relevance.
+ *
+ * Revision 1.5  1995/10/10  14:00:04  adam
+ * Function rset_open changed its wflag parameter to general flags.
+ *
+ * Revision 1.4  1995/10/06  14:38:06  adam
  * New result set method: r_score.
  * Local no (sysno) and score is transferred to retrieveCtrl.
  *
@@ -25,20 +39,20 @@
 #include <rsnull.h>
 #include <alexutil.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_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 = 
 {
-    "NULL set type",
-    0,
+    "null",
     r_create,
     r_open,
     r_close,
@@ -52,18 +66,15 @@ static const rset_control control =
 
 const rset_control *rset_kind_null = &control;
 
-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;
-
-    newct = xmalloc(sizeof(*newct));
-    memcpy(newct, sel, sizeof(*sel));
-    return newct;
+    return NULL;
 }
 
-static RSFD r_open (rset_control *ct, int wflag)
+static RSFD r_open (RSET ct, int flag)
 {
-    if (wflag)
+    if (flag & RSETF_WRITE)
     {
 	logf (LOG_FATAL, "NULL set type is read-only");
 	return NULL;
@@ -75,9 +86,8 @@ static void r_close (RSFD rfd)
 {
 }
 
-static void r_delete (rset_control *ct)
+static void r_delete (RSET ct)
 {
-    xfree(ct);
 }
 
 static void r_rewind (RSFD rfd)
@@ -85,7 +95,7 @@ static void r_rewind (RSFD rfd)
     logf (LOG_DEBUG, "rsnull_rewind");
 }
 
-static int r_count (rset_control *ct)
+static int r_count (RSET ct)
 {
     return 0;
 }