X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Frset.h;h=e42a6e21e82b7df405b8390dff31aca140445a57;hb=4da0cd2978c9a902be772e95302e6522175402fd;hp=7883d04fb4cb1aaba29bd5fc4045f2976b2c54ef;hpb=e6b40b4f140e8f7348fff1f7be78ac78946421ff;p=idzebra-moved-to-github.git diff --git a/include/rset.h b/include/rset.h index 7883d04..e42a6e2 100644 --- 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.25 2004-08-06 09:43:03 heikki Exp $ 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_count)(RSET ct); */ /* FIXME - remove this and add pos */ + void (*f_pos)(RSFD rfd, zint *current, zint *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); }; @@ -54,6 +55,7 @@ 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); +void rset_default_pos(RSFD rfd, zint *current, zint *total); struct rset_term { char *name; @@ -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)) -/* int rset_count(RSET rs); */ -#define rset_count(rs) (*(rs)->control->f_count)(rs) +/* int rset_pos(RSET rs, RSFD fd, zint *current, zint *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)