X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsnull.c;h=94d9be89e214fc4c5d55d72811ff3ff70762d988;hb=71e41c3f5146a6f783fbae7e59776bcdd4e3c4c8;hp=5ba6a4f03445cd0e752ced3bf740576ba0a243fa;hpb=221024eb6b10e45d6479bb4154dd7de7fca1d477;p=idzebra-moved-to-github.git

diff --git a/rset/rsnull.c b/rset/rsnull.c
index 5ba6a4f..94d9be8 100644
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,10 +1,22 @@
 /*
- * 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.9  1997-12-18 10:54:25  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.
@@ -47,19 +59,16 @@
 #include <rsnull.h>
 #include <zebrautl.h>
 
-static void *r_create(const struct rset_control *sel, void *parms,
-                      int *flags);
+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 ct);
 static void r_rewind (RSFD rfd);
 static int r_count (RSET ct);
-static int r_hits (RSET ct, void *oi);
-static int r_read (RSFD rfd, void *buf);
+static int r_read (RSFD rfd, void *buf, int *term_index);
 static int r_write (RSFD rfd, const void *buf);
-static int r_score (RSFD rfd, int *score);
 
-static const rset_control control = 
+static const struct rset_control control = 
 {
     "null",
     r_create,
@@ -68,17 +77,24 @@ static const rset_control control =
     r_delete,
     r_rewind,
     r_count,
-    r_hits,
     r_read,
     r_write,
-    r_score
 };
 
-const rset_control *rset_kind_null = &control;
+const struct rset_control *rset_kind_null = &control;
 
-static void *r_create(const struct rset_control *sel, void *parms,
-                      int *flags)
+static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
 {
+    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;
+
     return NULL;
 }
 
@@ -98,6 +114,8 @@ static void r_close (RSFD rfd)
 
 static void r_delete (RSET ct)
 {
+    rset_term_destroy (ct->rset_terms[0]);
+    xfree (ct->rset_terms);
 }
 
 static void r_rewind (RSFD rfd)
@@ -110,13 +128,9 @@ static int r_count (RSET ct)
     return 0;
 }
 
-static int r_hits (RSET ct, void *oi)
-{
-    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;
 }
 
@@ -126,9 +140,3 @@ static int r_write (RSFD rfd, const void *buf)
     return -1;
 }
 
-static int r_score (RSFD rfd, int *score)
-{
-    *score = -1;
-    return -1;
-}
-