X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=include%2Frset.h;h=23e72ecd3a5e68ebb8b1c058624bf0c5e93f0245;hb=b4470de12aa07f21f5394c19af0d21b196087225;hp=5830b4ecc81fd631414d8eea37bbe3d57bd28a4a;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git

diff --git a/include/rset.h b/include/rset.h
index 5830b4e..23e72ec 100644
--- a/include/rset.h
+++ b/include/rset.h
@@ -1,4 +1,4 @@
-/* $Id: rset.h,v 1.19 2002-08-02 19:26:55 adam Exp $
+/* $Id: rset.h,v 1.30 2004-08-23 12:38:53 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -33,7 +33,6 @@ extern "C" {
 typedef void *RSFD;
 
 typedef struct rset *RSET;
-typedef struct rset_term *RSET_TERM;
 
 struct rset_control
 {
@@ -43,34 +42,37 @@ struct rset_control
     void (*f_close)(RSFD rfd);
     void (*f_delete)(RSET ct);
     void (*f_rewind)(RSFD rfd);
-    int (*f_count)(RSET ct);
-    int (*f_read)(RSFD rfd, void *buf, int *term_index);
+    int (*f_forward)(RSET ct, RSFD rfd, void *buf,
+                     int (*cmpfunc)(const void *p1, const void *p2), 
+                     const void *untilbuf);
+    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 (*f_write)(RSFD rfd, const void *buf);
 };
 
+int rset_default_forward(RSET ct, RSFD rfd, void *buf, 
+                     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;
-    int  nn;
+    zint nn;
     char *flags;
-    int  count;
+    zint count;
     int  type;
 };
+*/
 
 typedef struct rset
 {
     const struct rset_control *control;
-    int  flags;
     int  count;
     void *buf;
-    RSET_TERM *rset_terms;
-    int no_rset_terms;
 } rset;
 
-RSET_TERM rset_term_create (const char *name, int length, const char *flags,
-                            int type);
-void rset_term_destroy (RSET_TERM t);
-RSET_TERM rset_term_dup (RSET_TERM t);
-
 #define RSETF_READ       0
 #define RSETF_WRITE      1
 
@@ -90,11 +92,16 @@ RSET rset_dup (RSET rs);
 /* void rset_rewind(RSET rs); */
 #define rset_rewind(rs, rfd) (*(rs)->control->f_rewind)((rfd))
 
-/* int rset_count(RSET rs); */
-#define rset_count(rs) (*(rs)->control->f_count)(rs)
+/* int rset_forward(RSET rs, void *buf, void *untilbuf); */
+#define rset_forward(rs, fd, buf, cmpfunc, untilbuf) \
+    (*(rs)->control->f_forward)((rs), (fd), (buf), (cmpfunc), (untilbuf))
+
+/* 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); */
-#define rset_read(rs, fd, buf, indx) (*(rs)->control->f_read)((fd), (buf), indx)
+#define rset_read(rs, fd, buf) (*(rs)->control->f_read)((fd), (buf))
 
 /* int rset_write(RSET rs, const void *buf); */
 #define rset_write(rs, fd, buf) (*(rs)->control->f_write)((fd), (buf))
@@ -102,9 +109,6 @@ RSET rset_dup (RSET rs);
 /* int rset_type (RSET) */
 #define rset_type(rs) ((rs)->control->desc)
 
-#define RSET_FLAG_VOLATILE 1
-
-#define rset_is_volatile(rs) ((rs)->flags & RSET_FLAG_VOLATILE)
 
 #ifdef __cplusplus
 }