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
Limiting hits to INT_MAX, because yaz can't handle 64-bit hitcounts
[idzebra-moved-to-github.git]
/
include
/
rset.h
diff --git
a/include/rset.h
b/include/rset.h
index
7883d04
..
e83870b
100644
(file)
--- a/
include/rset.h
+++ b/
include/rset.h
@@
-1,4
+1,4
@@
-/* $Id: rset.h,v 1.22 2004-08-03 12:15:44 heikki Exp $
+/* $Id: rset.h,v 1.28 2004-08-06 12:55:01 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-46,7
+46,8
@@
struct rset_control
int (*f_forward)(RSET ct, RSFD rfd, void *buf, int *term_index,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf);
int (*f_forward)(RSET ct, RSFD rfd, void *buf, int *term_index,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf);
-/* int (*f_count)(RSET ct); */ /* FIXME - remove this and add pos */
+ void (*f_pos)(RSFD rfd, double *current, double *total);
+ /* returns -1,-1 if pos function not implemented for this type */
int (*f_read)(RSFD rfd, void *buf, int *term_index);
int (*f_write)(RSFD rfd, const void *buf);
};
int (*f_read)(RSFD rfd, void *buf, int *term_index);
int (*f_write)(RSFD rfd, const void *buf);
};
@@
-54,12
+55,13
@@
struct rset_control
int rset_default_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf);
int rset_default_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf);
+void rset_default_pos(RSFD rfd, double *current, double *total);
struct rset_term {
char *name;
struct rset_term {
char *name;
- int nn;
+ zint nn;
char *flags;
char *flags;
- int count;
+ zint count;
int type;
};
int type;
};
@@
-101,8
+103,9
@@
RSET rset_dup (RSET rs);
#define rset_forward(rs, fd, buf, indx, cmpfunc, untilbuf) \
(*(rs)->control->f_forward)((rs), (fd), (buf), (indx), (cmpfunc), (untilbuf))
#define rset_forward(rs, fd, buf, indx, cmpfunc, untilbuf) \
(*(rs)->control->f_forward)((rs), (fd), (buf), (indx), (cmpfunc), (untilbuf))
-/* int rset_count(RSET rs); */
-#define rset_count(rs) (*(rs)->control->f_count)(rs)
+/* int rset_pos(RSET rs, RSFD fd, double *current, double *total); */
+#define rset_pos(rs,fd,cur,tot) \
+ (*(rs)->control->f_pos)( (fd),(cur),(tot))
/* int rset_read(RSET rs, void *buf, int *indx); */
#define rset_read(rs, fd, buf, indx) (*(rs)->control->f_read)((fd), (buf), indx)
/* int rset_read(RSET rs, void *buf, int *indx); */
#define rset_read(rs, fd, buf, indx) (*(rs)->control->f_read)((fd), (buf), indx)