X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=a1bee7e41fc4d2ae74a66955066ebec6823b6636;hb=087298c5eeb7746a1d0ded9067b1d582bd641a25;hp=be38062ff8b6beefc7ba9135bbc358e3fc5a5f4e;hpb=c41c84a497ae744aa825a90f144c85b54f1cd4bb;p=idzebra-moved-to-github.git

diff --git a/index/zserver.h b/index/zserver.h
index be38062..a1bee7e 100644
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.h,v $
- * Revision 1.47  2000-03-20 19:08:36  adam
+ * Revision 1.50  2000-11-29 14:24:01  adam
+ * Script configure uses yaz pthreads options. Added locking for
+ * zebra_register_{lock,unlock}.
+ *
+ * Revision 1.49  2000/05/18 12:01:36  adam
+ * System call times(2) used again. More 64-bit fixes.
+ *
+ * Revision 1.48  2000/04/05 09:49:35  adam
+ * On Unix, zebra/z'mbol uses automake.
+ *
+ * Revision 1.47  2000/03/20 19:08:36  adam
  * Added remote record import using Z39.50 extended services and Segment
  * Requests.
  *
@@ -219,10 +229,6 @@ struct zebra_service {
     ZebraLockHandle server_lock_cmt;
     ZebraLockHandle server_lock_org;
     char *server_path_prefix;
-#if HAVE_SYS_TIMES_H
-    struct tms tms1;
-    struct tms tms2;    
-#endif
     data1_handle dh;
     ZebraMaps zebra_maps;
     ZebraRankClass rank_classes;
@@ -230,7 +236,7 @@ struct zebra_service {
     Passwd_db passwd_db;
     Zebra_mutex_cond session_lock;
     int stop_flag;
-    int active;
+    int active; /* 0=shutdown, 1=enabled and inactive, 2=activated */
 };
 
 struct recKeys {
@@ -262,12 +268,17 @@ struct zebra_session {
     size_t ptr_i;
     size_t key_buf_used;
     int key_file_no;
+    char *admin_databaseName;
 
     int destroyed;
     ZebraSet sets;
     int errCode;
     int hits;
     char *errString;
+#if HAVE_SYS_TIMES_H
+    struct tms tms1;
+    struct tms tms2;    
+#endif
 };
 
 struct rank_control {
@@ -350,9 +361,9 @@ void zebra_index_merge (ZebraHandle zh);
 
 
 struct zebra_fetch_control {
-    int offset_end;
-    int record_offset;
-    int record_int_pos;
+    off_t offset_end;
+    off_t record_offset;
+    off_t record_int_pos;
     const char *record_int_buf;
     int record_int_len;
     int fd;