X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Frset.h;h=172ce37d4f9907ef54dc4a104b5e1502e0e0f23a;hb=b85319b88e7721ed86bbe4981839c6d2a1afea64;hp=2a86097d3017cadf73777f683aa58fecd8893ec7;hpb=a322231bcd4bfed2886c571aa91da5f73cad62a9;p=idzebra-moved-to-github.git

diff --git a/include/rset.h b/include/rset.h
index 2a86097..172ce37 100644
--- a/include/rset.h
+++ b/include/rset.h
@@ -1,81 +1,116 @@
-/*
- * Copyright (C) 1994-1995, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rset.h,v $
- * Revision 1.7  1995-09-07 13:58:08  adam
- * New parameter: result-set file descriptor (RSFD) to support multiple
- * positions within the same result-set.
- * Boolean operators: and, or, not implemented.
- *
- * Revision 1.6  1995/09/06  16:10:58  adam
- * More work on boolean sets.
- *
- * Revision 1.5  1995/09/04  15:20:13  adam
- * More work on temp sets. is_open member removed.
- *
- * Revision 1.4  1995/09/04  09:09:52  adam
- * String arg in dict lookup is const.
- * Minor changes.
- *
- * Revision 1.3  1994/11/22  13:15:27  quinn
- * Simple
- *
- * Revision 1.2  1994/11/04  13:21:21  quinn
- * Working.
- *
- * Revision 1.1  1994/11/03  14:13:22  quinn
- * Result set manipulation
- *
- */
+/* $Id: rset.h,v 1.20 2004-01-16 18:04:33 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 
 #ifndef RSET_H
 #define RSET_H
 
 #include <stdlib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 typedef void *RSFD;
 
-typedef struct rset_control
+typedef struct rset *RSET;
+typedef struct rset_term *RSET_TERM;
+
+struct rset_control
 {
     char *desc; /* text description of set type (for debugging) */
-    void *buf;  /* state data stored by subsystem */
-    struct rset_control *(*f_create)(const struct rset_control *sel, void *parms);
-    RSFD (*f_open)(struct rset_control *ct, int wflag);
+    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)(struct rset_control *ct);
+    void (*f_delete)(RSET ct);
     void (*f_rewind)(RSFD rfd);
-    int (*f_count)(struct rset_control *ct);
-    int (*f_read)(RSFD rfd, void *buf);
+    int (*f_forward)(RSFD rfd, void *buf, const void *untilbuf);
+    int (*f_count)(RSET ct);
+    int (*f_read)(RSFD rfd, void *buf, int *term_index);
     int (*f_write)(RSFD rfd, const void *buf);
-} rset_control;
+};
+
+int rset_default_forward(RSFD rfd, void *buf, const void *untilbuf);
+
+struct rset_term {
+    char *name;
+    int  nn;
+    char *flags;
+    int  count;
+    int  type;
+};
 
 typedef struct rset
 {
-    rset_control *control;
-} rset, *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
 
-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)->control, (wflag)))
+#define rset_open(rs, wflag) (*(rs)->control->f_open)((rs), (wflag))
 
 /* void rset_close(RSET rs); */
-#define rset_close(rs, rfd) ((*(rs)->control->f_close)((rfd)))
+#define rset_close(rs, rfd) (*(rs)->control->f_close)(rfd)
 
 void rset_delete(RSET rs);
 
+RSET rset_dup (RSET rs);
+
 /* void rset_rewind(RSET rs); */
-#define rset_rewind(rs, rfd) ((*(rs)->control->f_rewind)((rfd)))
+#define rset_rewind(rs, rfd) (*(rs)->control->f_rewind)((rfd))
 
 /* int rset_count(RSET rs); */
-#define rset_count(rs) ((*(rs)->control->f_count)((rs)->control))
+#define rset_count(rs) (*(rs)->control->f_count)(rs)
 
 /* 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)))
+#define rset_write(rs, fd, buf) (*(rs)->control->f_write)((fd), (buf))
+
+/* 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
+}
+#endif
 
 #endif