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

diff --git a/rset/rsnull.c b/rset/rsnull.c
index 895a244..ea44bd2 100644
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,4 +1,4 @@
-/* $Id: rsnull.c,v 1.17 2004-08-03 12:15:45 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
 
@@ -23,91 +23,82 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 
 #include <stdio.h>
-#include <rsnull.h>
+#include <assert.h>
 #include <zebrautl.h>
+#include <rset.h>
+
 
-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, int *term_index);
+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_create,
+    r_delete,
+    rset_get_no_terms,
     r_open,
     r_close,
-    r_delete,
-    r_rewind,
     rset_default_forward,
-    /* r_count, */
+    r_pos,
     r_read,
     r_write,
 };
 
 const struct rset_control *rset_kind_null = &control;
 
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
+RSET rsnull_create(NMEM nmem, const struct key_control *kcontrol )
 {
-    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;
+    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)
 {
-    rset_term_destroy (ct->rset_terms[0]);
-    xfree (ct->rset_terms);
 }
 
-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, int *term_index)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
 {
-    *term_index = -1;
+    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;
 }