X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsnull.c;h=aacf61a396be5406807a886a01c9b1eb49f0f3ae;hb=f7e93f016e75e43d037b5c3e89aeb27b7176513a;hp=8c597b76087bcd9c19a719ce86109589ed8612b0;hpb=b7ed8922d365e24874e561b7347c2c2ad682d6d8;p=idzebra-moved-to-github.git

diff --git a/rset/rsnull.c b/rset/rsnull.c
index 8c597b7..aacf61a 100644
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,90 +1,116 @@
-/*
- * Copyright (C) 1994-1995, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rsnull.c,v $
- * Revision 1.1  1995-09-06 10:35:44  adam
- * Null set implemented.
- *
- */
+/* $Id: rsnull.c,v 1.20 2004-08-06 10:09:28 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 <assert.h>
+#include <zebrautl.h>
 #include <rsnull.h>
-#include <alexutil.h>
-
-static rset_control *r_create(const struct rset_control *sel, void *parms);
-static int r_open (rset_control *ct, int wflag);
-static void r_close (rset_control *ct);
-static void r_delete (rset_control *ct);
-static void r_rewind (rset_control *ct);
-static int r_count (rset_control *ct);
-static int r_read (rset_control *ct, void *buf);
-static int r_write (rset_control *ct, const void *buf);
-
-static const rset_control control = 
+
+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 void r_pos (RSFD rfd, double *current, double *total);
+static int r_read (RSFD rfd, void *buf, int *term_index);
+static int r_write (RSFD rfd, const void *buf);
+
+static const struct rset_control control = 
 {
-    "NULL set type",
-    0,
+    "null",
     r_create,
     r_open,
     r_close,
     r_delete,
     r_rewind,
-    r_count,
+    rset_default_forward,
+    r_pos,
     r_read,
-    r_write
+    r_write,
 };
 
-const rset_control *rset_kind_null = &control;
+const struct rset_control *rset_kind_null = &control;
 
-static rset_control *r_create(const struct rset_control *sel, void *parms)
+static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
 {
-    rset_control *newct;
+    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;
 
-    logf (LOG_DEBUG, "rsnull_create(%s)", sel->desc);
-    newct = xmalloc(sizeof(*newct));
-    memcpy(newct, sel, sizeof(*sel));
-    return newct;
+    return NULL;
 }
 
-static int r_open(rset_control *ct, int wflag)
+static RSFD r_open (RSET ct, int flag)
 {
-    if (wflag)
+    if (flag & RSETF_WRITE)
     {
 	logf (LOG_FATAL, "NULL set type is read-only");
-	return -1;
+	return NULL;
     }
-    return 0;
+    return "";
 }
 
-static void r_close(rset_control *ct)
+static void r_close (RSFD rfd)
 {
-    /* NOP */
 }
 
-static void r_delete(rset_control *ct)
+static void r_delete (RSET ct)
 {
-    xfree(ct);
+    rset_term_destroy (ct->rset_terms[0]);
+    xfree (ct->rset_terms);
 }
 
-static void r_rewind(rset_control *ct)
+static void r_rewind (RSFD rfd)
 {
     logf (LOG_DEBUG, "rsnull_rewind");
 }
 
-static int r_count (rset_control *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 (rset_control *ct, void *buf)
+static int r_read (RSFD rfd, void *buf, int *term_index)
 {
+    *term_index = -1;
     return 0;
 }
 
-static int r_write (rset_control *ct, const void *buf)
+static int r_write (RSFD rfd, const void *buf)
 {
     logf (LOG_FATAL, "NULL set type is read-only");
     return -1;
 }
+