X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsnull.c;h=ea44bd2ac8bc3556624dbd279f162e8894b5f1f0;hb=d195e3229385349f842d2f82b65ad8118d64aec5;hp=fd98d300dfed3589852dfa67be31d3d4371e4e74;hpb=7b0a5daa703117cde2dc0d54d5a39941a1c01ce8;p=idzebra-moved-to-github.git

diff --git a/rset/rsnull.c b/rset/rsnull.c
index fd98d30..ea44bd2 100644
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,119 +1,104 @@
-/*
- * Copyright (C) 1994-1995, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rsnull.c,v $
- * 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
- * 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.30 2004-11-19 10:27:14 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 <assert.h>
+#include <zebrautl.h>
+#include <rset.h>
+
 
-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 ct);
-static void r_rewind (RSFD rfd);
-static int r_count (RSET ct);
-static int r_read (RSFD rfd, void *buf);
+static void r_pos (RSFD rfd, double *current, double *total);
+static int r_read (RSFD rfd, void *buf, TERMID *term);
 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,
+    r_delete,
+    rset_get_no_terms,
     r_open,
     r_close,
-    r_delete,
-    r_rewind,
-    r_count,
+    rset_default_forward,
+    r_pos,
     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)
+RSET rsnull_create(NMEM nmem, const struct key_control *kcontrol )
 {
-    return NULL;
+    RSET rnew=rset_create_base(&control, nmem, kcontrol,0,0);
+    rnew->priv=NULL;
+    return rnew;
 }
 
 static RSFD r_open (RSET ct, int flag)
 {
+    RSFD rfd;
     if (flag & RSETF_WRITE)
     {
-	logf (LOG_FATAL, "NULL set type is read-only");
-	return NULL;
+        yaz_log (YLOG_FATAL, "NULL set type is read-only");
+        return NULL;
     }
-    return "";
+    rfd=rfd_create_base(ct);
+    rfd->priv=NULL; 
+    return rfd;
 }
 
 static void r_close (RSFD rfd)
 {
+    rfd_delete_base(rfd);
 }
 
 static void r_delete (RSET ct)
 {
 }
 
-static void r_rewind (RSFD rfd)
-{
-    logf (LOG_DEBUG, "rsnull_rewind");
-}
 
-static int r_count (RSET ct)
+static void r_pos (RSFD rfd, double *current, double *total)
 {
-    return 0;
+    assert(rfd);
+    assert(current);
+    assert(total);
+    *total=0;
+    *current=0;
 }
 
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
 {
+    if (term)
+        *term=0; /* NULL */
     return 0;
 }
 
 static int r_write (RSFD rfd, const void *buf)
 {
-    logf (LOG_FATAL, "NULL set type is read-only");
-    return -1;
-}
-
-static int r_score (RSFD rfd, int *score)
-{
-    *score = -1;
+    yaz_log (YLOG_FATAL, "NULL set type is read-only");
     return -1;
 }