X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=f7402572f067ea77e420003e5db60762e365b8b4;hb=172e2b480354c7e44a50c654f09b8ab35f245f45;hp=33e566b2c32b7cb0e8c3b214f3f1d6d231efbe53;hpb=fb99bfcb44d29215f411d82646c59f2f74f5a25c;p=idzebra-moved-to-github.git

diff --git a/index/zserver.h b/index/zserver.h
index 33e566b..f740257 100644
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -1,22 +1,82 @@
 /*
- * Copyright (C) 1995, Index Data I/S 
+ * Copyright (C) 1994-1995, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.h,v $
- * Revision 1.1  1995-09-05 15:28:40  adam
+ * Revision 1.19  1996-05-14 11:34:01  adam
+ * Scan support in multiple registers/databases.
+ *
+ * Revision 1.18  1996/05/14  06:16:50  adam
+ * Compact use/set bytes used in search service.
+ *
+ * Revision 1.17  1995/12/08 16:22:57  adam
+ * Work on update while servers are running. Three lock files introduced.
+ * The servers reload their registers when necessary, but they don't
+ * reestablish result sets yet.
+ *
+ * Revision 1.16  1995/12/07  17:38:48  adam
+ * Work locking mechanisms for concurrent updates/commit.
+ *
+ * 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.
+ *
+ * Revision 1.5  1995/09/27  16:17:32  adam
+ * More work on retrieve.
+ *
+ * Revision 1.4  1995/09/14  11:53:28  adam
+ * First work on regular expressions/truncations.
+ *
+ * Revision 1.3  1995/09/08  08:53:23  adam
+ * Record buffer maintained in server_info.
+ *
+ * Revision 1.2  1995/09/06  16:11:19  adam
+ * Option: only one word key per file.
+ *
+ * Revision 1.1  1995/09/05  15:28:40  adam
  * More work on search engine.
  *
  */
 
-#include "index.h"
-#include <proto.h>
+#include <backend.h>
 #include <rset.h>
 
+#include "index.h"
+#include "zinfo.h"
+
 typedef struct {
-    size_t size;
-    char *buf;
-} ZServerRecord;
+    int sysno;
+    int score;
+} ZServerSetSysno;
 
 typedef struct ZServerSet_ {
     char *name;
@@ -26,20 +86,36 @@ typedef struct ZServerSet_ {
 } ZServerSet;
    
 typedef struct {
+    int registerState; /* 0 (no commit pages), 1 (use commit pages) */
+    time_t registerChange;
     ZServerSet *sets;
     Dict wordDict;
     ISAM wordIsam;
-    Dict fileDict;
-    int sys_idx_fd;
+    Records records;
+    int errCode;
+    char *errString;
+    ODR odr;
+    ZebTargetInfo *zti;
 } 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,
+              oid_value attributeset,
+              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);
-ZServerRecord *resultSetRecordGet (ZServerInfo *zi, const char *name,
-                                   int num, int *positions);
-void resultSetRecordDel (ZServerInfo *zi, ZServerRecord *records, int num);
+ZServerSetSysno *resultSetSysnoGet (ZServerInfo *zi, const char *name,
+                                    int num, int *positions);
+void resultSetSysnoDel (ZServerInfo *zi, ZServerSetSysno *records, int num);
+void zlog_rpn (Z_RPNQuery *rpn);
+
+int zebraServerLock (int lockCommit);
+void zebraServerUnlock (int commitPhase);
+int zebraServerLockGetState (time_t *timep);