X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsnull.c;h=4e9cc70de764d02207ec9dac47cda04748f9781f;hp=136617fda888bde7f27b5b97e1f890dfa43664af;hb=HEAD;hpb=40ca1d08c1d83b92e0b90951d918b252c61c63b2

diff --git a/rset/rsnull.c b/rset/rsnull.c
index 136617f..4e9cc70 100644
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,109 +1,100 @@
-/*
- * Copyright (C) 1994-1995, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rsnull.c,v $
- * 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.
- *
- */
+/* This file is part of the Zebra server.
+   Copyright (C) Index Data
+
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
-#include <rsnull.h>
-#include <alexutil.h>
+#include <assert.h>
+#include <idzebra/util.h>
+#include <rset.h>
 
-static rset_control *r_create(const struct rset_control *sel, void *parms);
-static RSFD r_open (rset_control *ct, int wflag);
-static void r_close (RSFD rfd);
-static void r_delete (rset_control *ct);
-static void r_rewind (RSFD rfd);
-static int r_count (rset_control *ct);
-static int r_read (RSFD rfd, void *buf);
-static int r_write (RSFD rfd, const void *buf);
-static int r_score (RSFD rfd, int *score);
+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 const rset_control control = 
+static const struct rset_control control =
 {
-    "NULL set type",
-    0,
-    r_create,
+    "null",
+    r_delete,
+    rset_get_one_term,
     r_open,
     r_close,
-    r_delete,
-    r_rewind,
-    r_count,
+    0, /* no forward */
+    r_pos,
     r_read,
-    r_write,
-    r_score
+    rset_no_write,
 };
 
-const rset_control *rset_kind_null = &control;
-
-static rset_control *r_create(const struct rset_control *sel, void *parms)
+RSET rset_create_null(NMEM nmem, struct rset_key_control *kcontrol,
+                      TERMID term)
 {
-    rset_control *newct;
-
-    newct = xmalloc(sizeof(*newct));
-    memcpy(newct, sel, sizeof(*sel));
-    return newct;
+    RSET rnew = rset_create_base(&control, nmem, kcontrol, 0, term, 0, 0);
+    rnew->priv = 0;
+    return rnew;
 }
 
-static RSFD r_open (rset_control *ct, int wflag)
+static RSFD r_open(RSET ct, int flag)
 {
-    if (wflag)
+    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 = 0;
+    return rfd;
 }
 
-static void r_close (RSFD rfd)
+static void r_close(RSFD rfd)
 {
 }
 
-static void r_delete (rset_control *ct)
+static void r_delete(RSET ct)
 {
-    xfree(ct);
 }
 
-static void r_rewind (RSFD rfd)
+static void r_pos(RSFD rfd, double *current, double *total)
 {
-    logf (LOG_DEBUG, "rsnull_rewind");
+    assert(rfd);
+    assert(current);
+    assert(total);
+    *total = 0;
+    *current = 0;
 }
 
-static int r_count (rset_control *ct)
+static int r_read(RSFD rfd, void *buf, TERMID *term)
 {
+    if (term)
+        *term = 0;
     return 0;
 }
 
-static int r_read (RSFD rfd, void *buf)
-{
-    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;
-    return -1;
-}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */