X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Frset.h;h=6baacf43864187c629d5fbdac3150bb92b5c068b;hb=c07c596f4c450d2ac08ba4da000f40294f099be0;hp=fd89b6639df9ab8b20fc418c99fa47fa35718bd8;hpb=bfaff2a3d97a1980b3318fedf628222ebf1a7225;p=idzebra-moved-to-github.git

diff --git a/include/rset.h b/include/rset.h
index fd89b66..6baacf4 100644
--- a/include/rset.h
+++ b/include/rset.h
@@ -1,10 +1,16 @@
 /*
- * Copyright (C) 1994-1998, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rset.h,v $
- * Revision 1.14  1998-02-10 11:56:46  adam
+ * Revision 1.16  1999-02-02 14:50:38  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.15  1998/03/05 08:37:44  adam
+ * New result set model.
+ *
+ * Revision 1.14  1998/02/10 11:56:46  adam
  * Implemented rset_dup.
  *
  * Revision 1.13  1997/12/18 10:54:24  adam
@@ -71,38 +77,46 @@ extern "C" {
 typedef void *RSFD;
 
 typedef struct rset *RSET;
+typedef struct rset_term *RSET_TERM;
 
-typedef struct rset_control
+struct rset_control
 {
     char *desc; /* text description of set type (for debugging) */
-    void *(*f_create)(const struct rset_control *sel, void *parms,
-                      int *flags);
+    void *(*f_create)(RSET ct, const struct rset_control *sel, void *parms);
     RSFD (*f_open)(RSET ct, int wflag);
     void (*f_close)(RSFD rfd);
     void (*f_delete)(RSET ct);
     void (*f_rewind)(RSFD rfd);
     int (*f_count)(RSET ct);
-    int (*f_hits)(RSET ct, void *oi);
-    int (*f_read)(RSFD rfd, void *buf);
+    int (*f_read)(RSFD rfd, void *buf, int *term_index);
     int (*f_write)(RSFD rfd, const void *buf);
-    int (*f_score)(RSFD rfd, int *score);
-} rset_control;
+};
+
+struct rset_term {
+    char *name;
+    int  nn;
+    char *flags;
+};
 
 typedef struct rset
 {
-    const rset_control *control;
+    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);
+void rset_term_destroy (RSET_TERM t);
+RSET_TERM rset_term_dup (RSET_TERM t);
+
 #define RSETF_READ       0
 #define RSETF_WRITE      1
 
-#define RSETF_SORT_SYSNO 0
-#define RSETF_SORT_RANK  2
-
-RSET rset_create(const rset_control *sel, void *parms);       /* parameters? */
+RSET rset_create(const struct rset_control *sel, void *parms); 
+/* parameters? */
 
 /* int rset_open(RSET rs, int wflag); */
 #define rset_open(rs, wflag) (*(rs)->control->f_open)((rs), (wflag))
@@ -120,27 +134,18 @@ RSET rset_dup (RSET rs);
 /* int rset_count(RSET rs); */
 #define rset_count(rs) (*(rs)->control->f_count)(rs)
 
-/* int rset_hits (RSET) */
-#define rset_hits(rs) (*(rs)->control->f_hits)((rs), 0)
-
 /* int rset_read(RSET rs, void *buf); */
-#define rset_read(rs, fd, buf) (*(rs)->control->f_read)((fd), (buf))
+#define rset_read(rs, fd, buf, indx) (*(rs)->control->f_read)((fd), (buf), indx)
 
 /* int rset_write(RSET rs, const void *buf); */
 #define rset_write(rs, fd, buf) (*(rs)->control->f_write)((fd), (buf))
 
-/* int rset_score(RSET rs, int *buf); */
-#define rset_score(rs, fd, score) (*(rs)->control->f_score)((fd), (score))
-
-
 /* int rset_type (RSET) */
 #define rset_type(rs) ((rs)->control->desc)
 
 #define RSET_FLAG_VOLATILE 1
-#define RSET_FLAG_RANKED 2
 
 #define rset_is_volatile(rs) ((rs)->flags & RSET_FLAG_VOLATILE)
-#define rset_is_ranked(rs) ((rs)->flags & RSET_FLAG_RANKED)
 
 #ifdef __cplusplus
 }