X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamb.c;h=ffab998618380f8b3998199616a4b43d3f548685;hb=4da0cd2978c9a902be772e95302e6522175402fd;hp=bac75e981194982b3ccd02f1815e18785e584576;hpb=70ba74c9bbf739fbe82d1bc2b0fb64a547c0c9e0;p=idzebra-moved-to-github.git diff --git a/rset/rsisamb.c b/rset/rsisamb.c index bac75e9..ffab998 100644 --- a/rset/rsisamb.c +++ b/rset/rsisamb.c @@ -1,4 +1,4 @@ -/* $Id: rsisamb.c,v 1.10 2004-08-03 14:54:41 heikki Exp $ +/* $Id: rsisamb.c,v 1.12 2004-08-06 09:43:04 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 void r_pos (RSFD rfd, int *current, int *total); +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); @@ -172,11 +172,15 @@ static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index, return i; } -static void r_pos (RSFD rfd, int *current, int *total) +static void r_pos (RSFD rfd, zint *current, zint *total) { 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 "ZINT_FORMAT"/"ZINT_FORMAT, + *current, *total); +#endif } static int r_read (RSFD rfd, void *buf, int *term_index) @@ -184,6 +188,7 @@ static int r_read (RSFD rfd, void *buf, int *term_index) 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) {