X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=6bcdf831b15381329b46e9c97ea1800e0daad1f0;hb=d23f1adde49e76cfda218d7f50ba886c16d1a044;hp=b5899c1db2658c2c42751589b8e00ac845604f5b;hpb=ca19a15163ee74ee0c6765bfef4fd9794627e26a;p=idzebra-moved-to-github.git

diff --git a/index/zserver.h b/index/zserver.h
index b5899c1..6bcdf83 100644
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -4,7 +4,35 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.h,v $
- * Revision 1.6  1995-09-28 09:19:48  adam
+ * Revision 1.15  1995-11-21 15:29:13  adam
+ * Config file 'base' read by default by both indexer and server.
+ *
+ * Revision 1.14  1995/11/16  17:00:57  adam
+ * Better logging of rpn query.
+ *
+ * Revision 1.13  1995/11/16  15:34:56  adam
+ * Uses new record management system in both indexer and server.
+ *
+ * Revision 1.12  1995/10/27  14:00:12  adam
+ * Implemented detection of database availability.
+ *
+ * Revision 1.11  1995/10/17  18:02:12  adam
+ * New feature: databases. Implemented as prefix to words in dictionary.
+ *
+ * Revision 1.10  1995/10/09  16:18:38  adam
+ * Function dict_lookup_grep got extra client data parameter.
+ *
+ * Revision 1.9  1995/10/06  14:38:01  adam
+ * New result set method: r_score.
+ * Local no (sysno) and score is transferred to retrieveCtrl.
+ *
+ * Revision 1.8  1995/10/06  13:52:06  adam
+ * Bug fixes. Handler may abort further scanning.
+ *
+ * Revision 1.7  1995/10/06  10:43:57  adam
+ * Scan added. 'occurrences' in scan entries not set yet.
+ *
+ * Revision 1.6  1995/09/28  09:19:48  adam
  * xfree/xmalloc used everywhere.
  * Extract/retrieve method seems to work for text records.
  *
@@ -25,17 +53,15 @@
  *
  */
 
-#include "index.h"
-#include <proto.h>
+#include <backend.h>
 #include <rset.h>
 
-typedef struct {
-    size_t size;
-    char *buf;
-} ZServerRecord;
+#include "index.h"
+#include "recindex.h"
 
 typedef struct {
     int sysno;
+    int score;
 } ZServerSetSysno;
 
 typedef struct ZServerSet_ {
@@ -49,20 +75,25 @@ typedef struct {
     ZServerSet *sets;
     Dict wordDict;
     ISAM wordIsam;
-    Dict fileDict;
-    int sys_idx_fd;
-    char *recordBuf;
+    Records records;
     int errCode;
     char *errString;
+    ODR odr;
 } ZServerInfo;
 
 int rpn_search (ZServerInfo *zi, 
                 Z_RPNQuery *rpn, int num_bases, char **basenames, 
                 const char *setname, int *hits);
 
+int rpn_scan (ZServerInfo *zi, Z_AttributesPlusTerm *zapt,
+              int num_bases, char **basenames,
+              int *position, int *num_entries, struct scan_entry **list,
+              int *status);
+
 ZServerSet *resultSetAdd (ZServerInfo *zi, const char *name,
                           int ov, RSET rset);
 ZServerSet *resultSetGet (ZServerInfo *zi, const char *name);
 ZServerSetSysno *resultSetSysnoGet (ZServerInfo *zi, const char *name,
                                     int num, int *positions);
-void resultSetRecordDel (ZServerInfo *zi, ZServerRecord *records, int num);
+void resultSetSysnoDel (ZServerInfo *zi, ZServerSetSysno *records, int num);
+void zlog_rpn (Z_RPNQuery *rpn);