X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=600c7322e78e4680b781f5e08bae58add8b9bf16;hb=e583a127856d4f363ff2ba7b4321bcc8c048edba;hp=d2343561e15b9d39531d599dfb804da98387e8f8;hpb=4e2fc80e64f3d7895a871ea5b08aa80045a59f2c;p=idzebra-moved-to-github.git

diff --git a/index/zserver.h b/index/zserver.h
index d234356..600c732 100644
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -1,10 +1,41 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1997, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.h,v $
- * Revision 1.16  1995-12-07 17:38:48  adam
+ * Revision 1.25  1997-09-29 09:08:36  adam
+ * Revised locking system to be thread safe for the server.
+ *
+ * Revision 1.24  1997/09/17 12:19:19  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.23  1996/12/23 15:30:46  adam
+ * Work on truncation.
+ * Bug fix: result sets weren't deleted after server shut down.
+ *
+ * Revision 1.22  1996/11/04 14:07:49  adam
+ * Moved truncation code to trunc.c.
+ *
+ * Revision 1.21  1996/10/29 14:09:58  adam
+ * Use of cisam system - enabled if setting isamc is 1.
+ *
+ * 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
@@ -56,11 +87,24 @@
  *
  */
 
+
+#ifndef USE_TIMES
+#ifdef __linux__
+#define USE_TIMES 1
+#else
+#define USE_TIMES 0
+#endif
+#endif
+
+#if USE_TIMES
+#include <sys/times.h>
+#endif
+
 #include <backend.h>
 #include <rset.h>
 
 #include "index.h"
-#include "recindex.h"
+#include "zinfo.h"
 
 typedef struct {
     int sysno;
@@ -76,13 +120,28 @@ typedef struct ZServerSet_ {
    
 typedef struct {
     int registerState; /* 0 (no commit pages), 1 (use commit pages) */
+    time_t registerChange;
     ZServerSet *sets;
-    Dict wordDict;
-    ISAM wordIsam;
+    Dict dict;
+    ISAM isam;
+    ISAMC isamc;
     Records records;
     int errCode;
     char *errString;
     ODR odr;
+    ZebTargetInfo *zti;
+    data1_handle dh;
+    data1_attset *registered_sets;
+    BFiles bfs;
+    Res res;
+
+    ZebraLockHandle server_lock_cmt;
+    ZebraLockHandle server_lock_org;
+    char *server_path_prefix;
+#ifdef USE_TIMES
+    struct tms tms1;
+    struct tms tms2;    
+#endif
 } ZServerInfo;
 
 int rpn_search (ZServerInfo *zi, 
@@ -90,14 +149,33 @@ 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);
 
+RSET rset_trunc (ZServerInfo *zi, ISAM_P *isam_p, int no);
+
 ZServerSet *resultSetAdd (ZServerInfo *zi, const char *name,
                           int ov, RSET rset);
 ZServerSet *resultSetGet (ZServerInfo *zi, const char *name);
+void resultSetDestroy (ZServerInfo *zi);
+
 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 zebra_server_lock_init (ZServerInfo *zi);
+int zebra_server_lock_destroy (ZServerInfo *zi);
+int zebra_server_lock (ZServerInfo *zi, int lockCommit);
+void zebra_server_unlock (ZServerInfo *zi, int commitPhase);
+int zebra_server_lock_get_state (ZServerInfo *zi, time_t *timep);
+
+typedef struct attent
+{
+    int attset_ordinal;
+    data1_local_attribute *local_attributes;
+} attent;
+
+int att_getentbyatt(ZServerInfo *zi, attent *res, oid_value set, int att);