X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Frset.h;h=e6bd85677a3238199c4c50cf7bcdfd3cd117d599;hb=70ba74c9bbf739fbe82d1bc2b0fb64a547c0c9e0;hp=cf368705cb734c6555b393752d51438eae799494;hpb=33b386a95c0aac273527d596ce1aafa0dc567b7b;p=idzebra-moved-to-github.git

diff --git a/include/rset.h b/include/rset.h
index cf36870..e6bd856 100644
--- a/include/rset.h
+++ b/include/rset.h
@@ -1,67 +1,26 @@
-/*
- * Copyright (C) 1994-1998, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rset.h,v $
- * 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
- * New method result set method rs_hits that returns the number of
- * hits in result-set (if known). The ranked result set returns real
- * number of hits but only when not combined with other operands.
- *
- * Revision 1.12  1997/09/05 15:30:03  adam
- * Changed prototype for chr_map_input - added const.
- * Added support for C++, headers uses extern "C" for public definitions.
- *
- * Revision 1.11  1995/12/11 09:07:53  adam
- * New rset member 'flag', that holds various flags about a result set -
- * currently 'volatile' (set is register dependent) and 'ranked' (set is
- * ranked).
- * New set types sand/sor/snot. They handle and/or/not for ranked and
- * semi-ranked result sets.
- *
- * Revision 1.10  1995/10/12  12:40:36  adam
- * Private info (buf) moved from struct rset_control to struct rset.
- * Member control in rset is statically set in rset_create.
- *
- * Revision 1.9  1995/10/10  14:00:01  adam
- * Function rset_open changed its wflag parameter to general flags.
- *
- * Revision 1.8  1995/10/06  14:37:53  adam
- * New result set method: r_score.
- * Local no (sysno) and score is transferred to retrieveCtrl.
- *
- * 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.23 2004-08-03 14:54:41 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
@@ -84,15 +43,27 @@ 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_forward)(RSET ct, RSFD rfd, void *buf,  int *term_index,
+                     int (*cmpfunc)(const void *p1, const void *p2), 
+                     const void *untilbuf);
+    void (*f_pos)(RSFD rfd, int *current, int *total);
+       /* FIXME - Should be 64-bit ints !*/
+       /* 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 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, int *current, int *total);
+
 struct rset_term {
     char *name;
     int  nn;
     char *flags;
+    int  count;
+    int  type;
 };
 
 typedef struct rset
@@ -105,7 +76,8 @@ typedef struct rset
     int no_rset_terms;
 } rset;
 
-RSET_TERM rset_term_create (const char *name, int length, const char *flags);
+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);
 
@@ -128,10 +100,14 @@ RSET rset_dup (RSET rs);
 /* void rset_rewind(RSET rs); */
 #define rset_rewind(rs, rfd) (*(rs)->control->f_rewind)((rfd))
 
+/* int rset_forward(RSET rs, void *buf, int *indx, void *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_read(RSET rs, void *buf); */
+/* 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_write(RSET rs, const void *buf); */