X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=e6636c7e3d07eebe2e0c90d01ce046216980398b;hb=b8844c65622c12fb105bf7fc6bab2fc237af7c14;hp=04547fb869b377ddac7fa3345c832e70149c8088;hpb=0d1685e5db9bf74ff80a4b483754532a73fcbb74;p=idzebra-moved-to-github.git

diff --git a/index/zserver.h b/index/zserver.h
index 04547fb..e6636c7 100644
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -1,10 +1,33 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1996, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.h,v $
- * Revision 1.13  1995-11-16 15:34:56  adam
+ * Revision 1.20  1996-06-04 10:19:02  adam
+ * Minor changes - removed include of ctype.h.
+ *
+ * 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
@@ -51,9 +74,7 @@
 #include <rset.h>
 
 #include "index.h"
-#if RECORD_BASE
-#include "recindex.h"
-#endif
+#include "zinfo.h"
 
 typedef struct {
     int sysno;
@@ -68,18 +89,16 @@ 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;
-#if RECORD_BASE
     Records records;
-#else
-    int sys_idx_fd;
-#endif
     int errCode;
     char *errString;
     ODR odr;
+    ZebTargetInfo *zti;
 } ZServerInfo;
 
 int rpn_search (ZServerInfo *zi, 
@@ -87,6 +106,7 @@ int rpn_search (ZServerInfo *zi,
                 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);
@@ -97,3 +117,8 @@ ZServerSet *resultSetGet (ZServerInfo *zi, const char *name);
 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);