X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=9ee5afc9b7b0ebf3b1d59c04c28c6628ff864dc8;hb=85df66537199c30a492ad54be4fbe25fa77e18c8;hp=60cb91ce5c2feaa1bac3c97197c4fb97428fcee2;hpb=8c1de7f1c9610a8da280fe93d785054ce86e7330;p=idzebra-moved-to-github.git

diff --git a/index/zserver.h b/index/zserver.h
index 60cb91c..9ee5afc 100644
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -4,7 +4,40 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.h,v $
- * Revision 1.7  1995-10-06 10:43:57  adam
+ * 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
@@ -28,17 +61,15 @@
  *
  */
 
-#include "index.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,12 +80,12 @@ 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;
-    char *recordBuf;
+    Records records;
     int errCode;
     char *errString;
     ODR odr;
@@ -64,12 +95,19 @@ int rpn_search (ZServerInfo *zi,
                 Z_RPNQuery *rpn, int num_bases, char **basenames, 
                 const char *setname, int *hits);
 
-int rpn_scan (ZServerInfo *zi, ODR odr, Z_AttributesPlusTerm *zapt,
-              int *position, int *num_entries, struct scan_entry **list);
+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);
+
+int zebraServerLock (int lockCommit);
+void zebraServerUnlock (int commitPhase);
+int zebraServerLockGetState (time_t *timep);