X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=43de5fe96a7b6e3e58979f4f8e9d125648d9deef;hb=75049be3951292bbbbd53d83ca38ccbd191e4b08;hp=92b8ddfcdd6eb25b9651098d718ea86c4652ad8a;hpb=d0276ba178f8bdd1ccad216d8b4ec9af832b0cf7;p=idzebra-moved-to-github.git

diff --git a/index/zserver.h b/index/zserver.h
index 92b8ddf..43de5fe 100644
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -1,10 +1,33 @@
 /*
- * Copyright (C) 1994-1998, Index Data I/S 
+ * Copyright (C) 1994-1998, Index Data 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.h,v $
- * Revision 1.33  1998-06-12 12:22:14  adam
+ * Revision 1.39  1998-10-16 08:14:35  adam
+ * Updated record control system.
+ *
+ * Revision 1.38  1998/09/22 10:03:44  adam
+ * Changed result sets to be persistent in the sense that they can
+ * be re-searched if needed.
+ * Fixed memory leak in rsm_or.
+ *
+ * Revision 1.37  1998/09/02 13:53:22  adam
+ * Extra parameter decode added to search routines to implement
+ * persistent queries.
+ *
+ * Revision 1.36  1998/06/24 12:16:16  adam
+ * Support for relations on text operands. Open range support in
+ * DFA module (i.e. [-j], [g-]).
+ *
+ * Revision 1.35  1998/06/23 15:33:35  adam
+ * Added feature to specify sort criteria in query (type 7 specifies
+ * sort flags).
+ *
+ * Revision 1.34  1998/06/22 11:36:50  adam
+ * Added authentication check facility to zebra.
+ *
+ * Revision 1.33  1998/06/12 12:22:14  adam
  * Work on Zebra API.
  *
  * Revision 1.32  1998/05/27 16:57:47  adam
@@ -134,6 +157,7 @@
 #include <rset.h>
 
 #include <sortidx.h>
+#include <passwddb.h>
 #include "index.h"
 #include "zebraapi.h"
 #include "zinfo.h"
@@ -178,6 +202,8 @@ struct zebra_info {
 #endif
     ZebraMaps zebra_maps;
     ZebraRankClass rank_classes;
+    RecTypes recTypes;
+    Passwd_db passwd_db;
 };
 
 
@@ -191,9 +217,9 @@ struct rank_control {
     void (*add)(void *set_handle, int seqno, int term_index);
 };
 
-void rpn_search (ZebraHandle zh, ODR stream,
+RSET rpn_search (ZebraHandle zh, NMEM mem,
 		 Z_RPNQuery *rpn, int num_bases, char **basenames, 
-		 const char *setname);
+		 const char *setname, ZebraSet sset);
 
 
 void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
@@ -205,9 +231,10 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 RSET rset_trunc (ZebraHandle zh, ISAM_P *isam_p, int no,
 		 const char *term, int length_term, const char *flags);
 
-ZebraSet resultSetAdd (ZebraHandle zh, const char *name,
-                          int ov, RSET rset, int *hits);
+ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov);
 ZebraSet resultSetGet (ZebraHandle zh, const char *name);
+ZebraSet resultSetAddRPN (ZebraHandle zh, ODR stream, ODR decode,                                         Z_RPNQuery *rpn, int num_bases, char **basenames,
+                          const char *setname);
 RSET resultSetRef (ZebraHandle zh, Z_ResultSetId *resultSetId);
 void resultSetDestroy (ZebraHandle zh);
 
@@ -215,14 +242,18 @@ ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
 			       int num, int *positions);
 void zebraPosSetDestroy (ZebraHandle zh, ZebraPosSet records, int num);
 
-void resultSetSort (ZebraHandle zh, ODR stream,
-		    int num_input_setnames, char **input_setnames,
-		    char *output_setname, Z_SortKeySpecList *sort_sequence,
-		    int *sort_status);
+void resultSetSort (ZebraHandle zh, NMEM nmem,
+		    int num_input_setnames, const char **input_setnames,
+		    const char *output_setname,
+		    Z_SortKeySpecList *sort_sequence, int *sort_status);
+void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
+			  ZebraSet sset, RSET rset,
+			  Z_SortKeySpecList *sort_sequence, int *sort_status);
+void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset);
 
 void zebra_sort (ZebraHandle zh, ODR stream,
-		 int num_input_setnames, char **input_setnames,
-		 char *output_setname, Z_SortKeySpecList *sort_sequence,
+		 int num_input_setnames, const char **input_setnames,
+		 const char *output_setname, Z_SortKeySpecList *sort_sequence,
 		 int *sort_status);
 
 void zlog_rpn (Z_RPNQuery *rpn);