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

diff --git a/rset/rsnull.c b/rset/rsnull.c
index 0835cff..ea44bd2 100644
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,4 +1,4 @@
-/* $Id: rsnull.c,v 1.27 2004-09-30 09:53:05 heikki Exp $
+/* $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
 
@@ -32,13 +32,14 @@ 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);
+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,
     rset_default_forward,
@@ -51,7 +52,7 @@ const struct rset_control *rset_kind_null = &control;
 
 RSET rsnull_create(NMEM nmem, const struct key_control *kcontrol )
 {
-    RSET rnew=rset_create_base(&control, nmem, kcontrol,0);
+    RSET rnew=rset_create_base(&control, nmem, kcontrol,0,0);
     rnew->priv=NULL;
     return rnew;
 }
@@ -61,7 +62,7 @@ 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;
     }
     rfd=rfd_create_base(ct);
@@ -88,14 +89,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; /* NULL */
     return 0;
 }
 
 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;
 }