X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamb.c;h=094ba8513130cb46c40970043a8c9898411f4ae0;hb=e172ced0dcc937dfc433a33c7e20962b9e6b5ea0;hp=cd16cba9abba8f2ebb6d573498663a22104fcd5c;hpb=726c42c6ae793b79a5351d2fce805d220d21321e;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamb.c b/rset/rsisamb.c
index cd16cba..094ba85 100644
--- a/rset/rsisamb.c
+++ b/rset/rsisamb.c
@@ -1,4 +1,4 @@
-/* $Id: rsisamb.c,v 1.22 2004-09-09 10:08:06 heikki Exp $
+/* $Id: rsisamb.c,v 1.25 2004-10-22 10:12:52 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -33,19 +33,18 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 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_forward(RSFD rfd, void *buf, const void *untilbuf);
+static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf);
 static void r_pos (RSFD rfd, double *current, double *total);
-static int r_read (RSFD rfd, void *buf);
+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 = 
 {
     "isamb",
     r_delete,
+    rset_get_one_term,
     r_open,
     r_close,
-    r_rewind,
     r_forward, 
     r_pos,
     r_read,
@@ -65,9 +64,9 @@ struct rset_isamb_info {
 };
 
 RSET rsisamb_create( NMEM nmem, const struct key_control *kcontrol, int scope,
-            ISAMB is, ISAMB_P pos)
+            ISAMB is, ISAMB_P pos, TERMID term)
 {
-    RSET rnew=rset_create_base(&control, nmem, kcontrol, scope);
+    RSET rnew=rset_create_base(&control, nmem, kcontrol, scope, term);
     struct rset_isamb_info *info;
     info = (struct rset_isamb_info *) nmem_malloc(rnew->nmem,sizeof(*info));
     info->is=is;
@@ -112,16 +111,14 @@ static void r_close (RSFD rfd)
 }
 
 
-static void r_rewind (RSFD rfd)
-{   
-    logf (LOG_DEBUG, "rsisamb_rewind");
-    abort ();
-}
-
-static int r_forward(RSFD rfd, void *buf, const void *untilbuf)
+static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf)
 {
     struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv);
-    return isamb_pp_forward(pinfo->pt, buf, untilbuf);
+    int rc;
+    rc=isamb_pp_forward(pinfo->pt, buf, untilbuf);
+    if (rc && term)
+        *term=rfd->rset->term;
+    return rc; 
 }
 
 static void r_pos (RSFD rfd, double *current, double *total)
@@ -135,11 +132,14 @@ static void r_pos (RSFD rfd, double *current, double *total)
 #endif
 }
 
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
 {
     struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv);
-
-    return isamb_pp_read(pinfo->pt, buf);
+    int rc;
+    rc=isamb_pp_read(pinfo->pt, buf);
+    if (rc && term)
+        *term=rfd->rset->term;
+    return rc;
 }
 
 static int r_write (RSFD rfd, const void *buf)