X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamb.c;h=0bc710771257c3560ba5efd131366e8c5e80db2e;hb=714fc16a13c620527ebc11d254ba4e7b299a25f0;hp=2d732af6345a539c3dc8d6640c935a6b16c1ec01;hpb=152a0ee011a478b0ee8c3ba4045bdd707e702d0b;p=idzebra-moved-to-github.git diff --git a/rset/rsisamb.c b/rset/rsisamb.c index 2d732af..0bc7107 100644 --- a/rset/rsisamb.c +++ b/rset/rsisamb.c @@ -1,4 +1,4 @@ -/* $Id: rsisamb.c,v 1.8 2004-06-01 15:22:58 adam Exp $ +/* $Id: rsisamb.c,v 1.11 2004-08-04 09:59:03 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -39,7 +39,7 @@ static void r_rewind (RSFD rfd); static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index, int (*cmpfunc)(const void *p1, const void *p2), const void *untilbuf); -static int r_count (RSET ct); +static void r_pos (RSFD rfd, zint *current, zint *total); static int r_read (RSFD rfd, void *buf, int *term_index); static int r_write (RSFD rfd, const void *buf); @@ -52,7 +52,7 @@ static const struct rset_control control = r_delete, r_rewind, r_forward, /* rset_default_forward, */ - r_count, + r_pos, r_read, r_write, }; @@ -156,7 +156,7 @@ static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index, int (*cmpfunc)(const void *p1, const void *p2), const void *untilbuf) { - int i; /*!*/ + 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)", @@ -172,9 +172,11 @@ static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index, return i; } -static int r_count (RSET ct) +static void r_pos (RSFD rfd, zint *current, zint *total) { - return 0; + struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd; + assert(rfd); + isamb_pp_pos(pinfo->pt, current, total); } static int r_read (RSFD rfd, void *buf, int *term_index)