X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsnull.c;h=69e1d00de3faddd8a4ea904e83f2c69ef0c7d283;hb=82d84f705e42b4e4abf746f923036b7ac8986b1e;hp=3cf371fcf245cdea5753f5127df1eb617ace84c4;hpb=5c7ad71f534d092eaf97f04dd39c5e874e0d45b0;p=idzebra-moved-to-github.git

diff --git a/rset/rsnull.c b/rset/rsnull.c
index 3cf371f..69e1d00 100644
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,65 +1,69 @@
-/*
- * Copyright (C) 1994-1995, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rsnull.c,v $
- * 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
- * New parameter: result-set file descriptor (RSFD) to support multiple
- * positions within the same result-set.
- * Boolean operators: and, or, not implemented.
- *
- * Revision 1.1  1995/09/06  10:35:44  adam
- * Null set implemented.
- *
- */
+/* $Id: rsnull.c,v 1.16 2004-01-16 15:27:35 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 
 #include <stdio.h>
 #include <rsnull.h>
-#include <alexutil.h>
+#include <zebrautl.h>
 
-static void *r_create(const struct rset_control *sel, void *parms);
+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_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 set type",
+    "null",
     r_create,
     r_open,
     r_close,
     r_delete,
     r_rewind,
+    rset_default_forward,
     r_count,
     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)
+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",
+                                              0);
+    ct->rset_terms[0]->nn = 0;
+
     return NULL;
 }
 
@@ -79,6 +83,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)
@@ -91,8 +97,9 @@ 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;
 }
 
@@ -102,9 +109,3 @@ static int r_write (RSFD rfd, const void *buf)
     return -1;
 }
 
-static int r_score (RSFD rfd, int *score)
-{
-    *score = -1;
-    return -1;
-}
-