X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamb.c;h=1c246504e53878c03bf6791cdaf239d2187b858b;hb=863d336f803da454e03f39ee2225719fed05021e;hp=7466c4a390d10db71a8eb45b0b651d7aaaa722bc;hpb=764b78fb481cf1084a5a583ffefbe8a0f32af28c;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamb.c b/rset/rsisamb.c
index 7466c4a..1c24650 100644
--- a/rset/rsisamb.c
+++ b/rset/rsisamb.c
@@ -1,34 +1,58 @@
-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- *
- * $Id: rsisamb.c,v 1.1 2002-04-16 22:31:42 adam Exp $
- */
+/* $Id: rsisamb.c,v 1.15 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 <assert.h>
 #include <zebrautl.h>
 #include <rsisamb.h>
+#include <string.h>
+#include <../index/index.h> /* for log_keydump. Debugging only */
+
+#ifndef RSET_DEBUG
+#define RSET_DEBUG 0
+#endif
 
 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 int r_forward(RSET ct, RSFD rfd, void *buf,
+                     int (*cmpfunc)(const void *p1, const void *p2),
+                     const void *untilbuf);
+static void r_pos (RSFD rfd, double *current, double *total);
+static int r_read (RSFD rfd, void *buf);
 static int r_write (RSFD rfd, const void *buf);
 
 static const struct rset_control control = 
 {
-    "isamc",
+    "isamb",
     r_create,
     r_open,
     r_close,
     r_delete,
     r_rewind,
-    r_count,
+    r_forward, /* rset_default_forward, */
+    r_pos,
     r_read,
     r_write,
 };
@@ -39,7 +63,6 @@ struct rset_pp_info {
     ISAMB_PP pt;
     struct rset_pp_info *next;
     struct rset_isamb_info *info;
-    int *countp;
     void *buf;
 };
 
@@ -63,9 +86,6 @@ static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
     info->key_size = pt->key_size;
     info->cmp = pt->cmp;
     info->ispt_list = NULL;
-    ct->no_rset_terms = 1;
-    ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
-    ct->rset_terms[0] = pt->rset_term;
     return info;
 }
 
@@ -85,10 +105,6 @@ RSFD r_open (RSET ct, int flag)
     info->ispt_list = ptinfo;
     ptinfo->pt = isamb_pp_open (info->is, info->pos);
     ptinfo->info = info;
-    if (ct->rset_terms[0]->nn < 0)
-	ct->rset_terms[0]->nn = isamb_pp_num (ptinfo->pt);
-    ct->rset_terms[0]->count = 0;
-    ptinfo->countp = &ct->rset_terms[0]->count;
     ptinfo->buf = xmalloc (info->key_size);
     return ptinfo;
 }
@@ -117,8 +133,6 @@ static void r_delete (RSET ct)
 
     logf (LOG_DEBUG, "rsisamb_delete");
     assert (info->ispt_list == NULL);
-    rset_term_destroy (ct->rset_terms[0]);
-    xfree (ct->rset_terms);
     xfree (info);
 }
 
@@ -128,25 +142,43 @@ static void r_rewind (RSFD rfd)
     abort ();
 }
 
-static int r_count (RSET ct)
+static int r_forward(RSET ct, RSFD rfd, void *buf, 
+                     int (*cmpfunc)(const void *p1, const void *p2),
+                     const void *untilbuf)
+{
+    int i; 
+    struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
+#if RSET_DEBUG
+    logf (LOG_DEBUG, "rset_rsisamb_forward starting '%s' (ct=%p rfd=%p)",
+                      ct->control->desc, ct,rfd);
+    key_logdump(LOG_DEBUG, untilbuf);
+    key_logdump(LOG_DEBUG, buf);
+#endif
+
+    i=isamb_pp_forward(pinfo->pt, buf, untilbuf);
+#if RSET_DEBUG
+    logf (LOG_DEBUG, "rset_rsisamb_forward returning %d",i);
+#endif
+    return i;
+}
+
+static void r_pos (RSFD rfd, double *current, double *total)
 {
-    return 0;
+    struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
+    assert(rfd);
+    isamb_pp_pos(pinfo->pt, current, total);
+#if RSET_DEBUG
+    logf(LOG_DEBUG,"isamb.r_pos returning %0.1f/%0.1f",
+              *current, *total);
+#endif
 }
 
-static int r_read (RSFD rfd, void *buf, int *term_index)
+static int r_read (RSFD rfd, void *buf)
 {
     struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
     int r;
-    *term_index = 0;
+
     r = isamb_pp_read(pinfo->pt, buf);
-    if (r > 0)
-    {
-        if (*pinfo->countp == 0 || (*pinfo->info->cmp)(buf, pinfo->buf) > 1)
-        {
-            memcpy (pinfo->buf, buf, pinfo->info->key_size);
-            (*pinfo->countp)++;
-        }
-    }
     return r;
 }