X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsnull.c;h=09ee8c21f7bc7ac35e2d957492d51c6ee1a1b935;hb=d8e960f5f1060148a5fffa7a767c72391662fbdc;hp=2b0902ea9669e769ae28e1003eeac119392db391;hpb=927733195c5646988dcc65365bb45b978b02a15a;p=idzebra-moved-to-github.git

diff --git a/rset/rsnull.c b/rset/rsnull.c
index 2b0902e..09ee8c2 100644
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,6 +1,6 @@
-/* $Id: rsnull.c,v 1.22 2004-08-24 14:25:16 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: rsnull.c,v 1.34 2005-05-03 09:11:36 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,76 +20,61 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
 #include <stdio.h>
 #include <assert.h>
-#include <zebrautl.h>
-#include <rsnull.h>
-
-/* FIXME - Use the nmem instead of xmalloc all the way through */
+#include <idzebra/util.h>
+#include <rset.h>
 
-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 void r_pos (RSFD rfd, double *current, double *total);
-static int r_read (RSFD rfd, void *buf);
-static int r_write (RSFD rfd, const void *buf);
+static RSFD r_open(RSET ct, int flag);
+static void r_close(RSFD rfd);
+static void r_delete(RSET ct);
+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 const struct rset_control control = 
 {
     "null",
+    r_delete,
+    rset_get_no_terms,
     r_open,
     r_close,
-    r_delete,
-    r_rewind,
     rset_default_forward,
     r_pos,
     r_read,
     r_write,
 };
 
-const struct rset_control *rset_kind_null = &control;
-
-RSET rsnull_create(NMEM nmem )
+RSET rsnull_create(NMEM nmem, struct rset_key_control *kcontrol )
 {
-    RSET rnew=rset_create_base(&control, nmem);
-    rnew->priv=NULL;
+    RSET rnew = rset_create_base(&control, nmem, kcontrol, 0, 0);
+    rnew->priv = 0;
     return rnew;
 }
 
-#if 0
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
-{
-    return NULL;
-}
-#endif
-
-static RSFD r_open (RSET ct, int flag)
+static RSFD r_open(RSET ct, int flag)
 {
+    RSFD rfd;
     if (flag & RSETF_WRITE)
     {
-        logf (LOG_FATAL, "NULL set type is read-only");
+        yaz_log (YLOG_FATAL, "NULL set type is read-only");
         return NULL;
     }
-    return "";
-}
-
-static void r_close (RSFD rfd)
-{
+    rfd = rfd_create_base(ct);
+    rfd->priv = 0;
+    return rfd;
 }
 
-static void r_delete (RSET ct)
+static void r_close(RSFD rfd)
 {
+    rfd_delete_base(rfd);
 }
 
-static void r_rewind (RSFD rfd)
+static void r_delete(RSET ct)
 {
-    logf (LOG_DEBUG, "rsnull_rewind");
 }
 
-static void r_pos (RSFD rfd, double *current, double *total)
+static void r_pos(RSFD rfd, double *current, double *total)
 {
     assert(rfd);
     assert(current);
@@ -98,14 +83,16 @@ static void r_pos (RSFD rfd, double *current, double *total)
     *current=0;
 }
 
-static int r_read (RSFD rfd, void *buf)
+static int r_read(RSFD rfd, void *buf, TERMID *term)
 {
+    if (term)
+        *term = 0;
     return 0;
 }
 
-static int r_write (RSFD rfd, const void *buf)
+static int r_write(RSFD rfd, const void *buf)
 {
-    logf (LOG_FATAL, "NULL set type is read-only");
+    yaz_log (YLOG_FATAL, "NULL set type is read-only");
     return -1;
 }