projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix term counters to be of type zint. Fix several printfs of zint.
[idzebra-moved-to-github.git]
/
rset
/
rsisamb.c
diff --git
a/rset/rsisamb.c
b/rset/rsisamb.c
index
bac75e9
..
7965ece
100644
(file)
--- 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.14 2004-08-06 12:55:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
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_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, double *current, double *total);
static int r_read (RSFD rfd, void *buf, int *term_index);
static int r_write (RSFD rfd, const void *buf);
static int r_read (RSFD rfd, void *buf, int *term_index);
static int r_write (RSFD rfd, const void *buf);
@@
-63,7
+63,7
@@
struct rset_pp_info {
ISAMB_PP pt;
struct rset_pp_info *next;
struct rset_isamb_info *info;
ISAMB_PP pt;
struct rset_pp_info *next;
struct rset_isamb_info *info;
- int *countp;
+ zint *countp;
void *buf;
};
void *buf;
};
@@
-172,11
+172,15
@@
static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
return i;
}
return i;
}
-static void r_pos (RSFD rfd, int *current, int *total)
+static void r_pos (RSFD rfd, double *current, double *total)
{
struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
assert(rfd);
isamb_pp_pos(pinfo->pt, current, 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 %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, 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;
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)
{
r = isamb_pp_read(pinfo->pt, buf);
if (r > 0)
{