Looping bug at hit fixed (I hope)

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

diff --git a/rset/rsnull.c b/rset/rsnull.c
index d46c9aa..94d9be8 100644 (file)
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,10 +1,48 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsnull.c,v $
- * Revision 1.3  1995-09-08 14:52:42  adam
+ * Revision 1.13  2002-03-21 10:25:42  adam
+ * use lockDir. Fixes for searchResult for null/sort sets
+ *
+ * Revision 1.12  1999/05/26 07:49:14  adam
+ * C++ compilation.
+ *
+ * Revision 1.11  1999/02/02 14:51:36  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.10  1998/03/05 08:36:28  adam
+ * New result set model.
+ *
+ * Revision 1.9  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.8  1996/10/29 13:55:24  adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * 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.
+ *
+ * Revision 1.3  1995/09/08  14:52:42  adam
  * Work on relevance feedback.
  *
  * Revision 1.2  1995/09/07  13:58:43  adam
@@ -19,21 +57,20 @@
 
 #include <stdio.h>
 #include <rsnull.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(RSET ct, const struct rset_control *sel, void *parms);
+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_read (RSFD rfd, void *buf);
+static int r_count (RSET ct);
+static int r_read (RSFD rfd, void *buf, int *term_index);
 static int r_write (RSFD rfd, const void *buf);
 
-static const rset_control control = 
+static const struct rset_control control = 
 {
-    "NULL set type",
-    0,
+    "null",
     r_create,
     r_open,
     r_close,
@@ -41,23 +78,29 @@ static const rset_control control =
     r_rewind,
     r_count,
     r_read,
-    r_write
+    r_write,
 };
 
-const rset_control *rset_kind_null = &control;
+const struct rset_control *rset_kind_null = &control;
 
-static rset_control *r_create(const struct rset_control *sel, void *parms)
+static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
 {
-    rset_control *newct;
+    rset_null_parms *null_parms = (rset_null_parms *) parms;
+
+    ct->no_rset_terms = 1;
+    ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
+    if (parms && null_parms->rset_term)
+       ct->rset_terms[0] = null_parms->rset_term;
+    else
+       ct->rset_terms[0] = rset_term_create ("term", -1, "rank-0");
+    ct->rset_terms[0]->nn = 0;
 
-    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;
@@ -69,9 +112,10 @@ static void r_close (RSFD rfd)
 {
 }
 
-static void r_delete (rset_control *ct)
+static void r_delete (RSET ct)
 {
-    xfree(ct);
+    rset_term_destroy (ct->rset_terms[0]);
+    xfree (ct->rset_terms);
 }
 
 static void r_rewind (RSFD rfd)
@@ -79,13 +123,14 @@ 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;
 }
 
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, int *term_index)
 {
+    *term_index = -1;
     return 0;
 }
 
@@ -94,3 +139,4 @@ static int r_write (RSFD rfd, const void *buf)
     logf (LOG_FATAL, "NULL set type is read-only");
     return -1;
 }
+