Removed the term count stuff from all rsets, and fixed what ever that broke.

[idzebra-moved-to-github.git] / rset / rset.c

diff --git a/rset/rset.c b/rset/rset.c
index d6e2041..d37203f 100644 (file)
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,61 +1,94 @@
-/*
- * Copyright (C) 1994-1995, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rset.c,v $
- * Revision 1.8  1995-12-11 09:15:23  adam
- * New set types: sand/sor/snot - ranked versions of and/or/not in
- * ranked/semi-ranked result sets.
- * Note: the snot not finished yet.
- * New rset member: flag.
- * Bug fix: r_delete in rsrel.c did free bad memory block.
- *
- * Revision 1.7  1995/10/12  12:41:56  adam
- * Private info (buf) moved from struct rset_control to struct rset.
- * Bug fixes in relevance.
- *
- * Revision 1.6  1995/09/08  14:52:41  adam
- * Work on relevance feedback.
- *
- * Revision 1.5  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.4  1995/09/06  16:11:56  adam
- * More work on boolean sets.
- *
- * Revision 1.3  1995/09/04  15:20:39  adam
- * More work on temp sets. is_open member removed.
- *
- * Revision 1.2  1995/09/04  12:33:56  adam
- * Various cleanup. YAZ util used instead.
- *
- * Revision 1.1  1994/11/04  13:21:28  quinn
- * Working.
- *
- */
+/* $Id: rset.c,v 1.25 2004-08-20 14:44:46 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+   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 <alexutil.h>
+#include <string.h>
+#include <zebrautl.h>
+#include <assert.h>
 
 #include <rset.h>
+/* #include <../index/index.h> */ /* for log_keydump. Debugging only */
 
-RSET rset_create(const rset_control *sel, void *parms)
+RSET rset_create(const struct rset_control *sel, void *parms)
 {
     RSET rnew;
 
     logf (LOG_DEBUG, "rs_create(%s)", sel->desc);
-    rnew = xmalloc(sizeof(*rnew));
+    rnew = (RSET) xmalloc(sizeof(*rnew));
     rnew->control = sel;
     rnew->flags = 0;
-    rnew->buf = (*sel->f_create)(sel, parms, &rnew->flags);
+    rnew->count = 1;
+    rnew->buf = (*sel->f_create)(rnew, sel, parms);
     return rnew;
 }
 
 void rset_delete (RSET rs)
 {
-    (*rs->control->f_delete)(rs);
-    xfree(rs);
+    (rs->count)--;
+    if (!rs->count)
+    {
+        (*rs->control->f_delete)(rs);
+        xfree(rs);
+    }
 }
+
+RSET rset_dup (RSET rs)
+{
+    (rs->count)++;
+    return rs;
+}
+
+void rset_default_pos (RSFD rfd, double *current, double *total)
+{ /* This should never really be needed, but it is still used in */
+  /* those rsets that we don't really plan to use, like isam-s */
+    assert(rfd);
+    assert(current);
+    assert(total);
+    *current=-1; /* signal that pos is not implemented */
+    *total=-1;
+} /* rset_default_pos */
+
+int rset_default_forward(RSET ct, RSFD rfd, void *buf, 
+                           int (*cmpfunc)(const void *p1, const void *p2), 
+                           const void *untilbuf)
+{
+    int more=1;
+    int cmp=2;
+    logf (LOG_DEBUG, "rset_default_forward starting '%s' (ct=%p rfd=%p)",
+                    ct->control->desc, ct,rfd);
+    /* key_logdump(LOG_DEBUG, untilbuf); */
+    while ( (cmp==2) && (more))
+    {
+        logf (LOG_DEBUG, "rset_default_forward looping m=%d c=%d",more,cmp);
+        more=rset_read(ct, rfd, buf);
+        if (more)
+            cmp=(*cmpfunc)(untilbuf,buf);
+/*        if (more)
+            key_logdump(LOG_DEBUG,buf); */
+    }
+    logf (LOG_DEBUG, "rset_default_forward exiting m=%d c=%d",more,cmp);
+
+    return more;
+}
+