X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=8680d439a81ea626ba5616ff354c70bcd940e975;hb=7149e5607a0d473d958ed1758728cc343b56d681;hp=0b49c28a777844bfda6d7840b63e4a6fa661e5b9;hpb=e150e51a7e20a902e9fd2f11f00811f94f67d529;p=idzebra-moved-to-github.git

diff --git a/index/zserver.h b/index/zserver.h
index 0b49c28..8680d43 100644
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -1,10 +1,23 @@
 /*
- * Copyright (C) 1994-1999, Index Data 
+ * Copyright (C) 1994-2000, Index Data 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.h,v $
- * Revision 1.45  1999-11-30 13:48:04  adam
+ * 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.
+ *
+ * Revision 1.46  2000/03/15 15:00:31  adam
+ * First work on threaded version.
+ *
+ * Revision 1.45  1999/11/30 13:48:04  adam
  * Improved installation. Updated for inclusion of YAZ header files.
  *
  * Revision 1.44  1999/11/04 15:00:45  adam
@@ -163,6 +176,10 @@
 #include <sys/times.h>
 #endif
 
+#if HAVE_PTHREADS_H
+#include <pthreads.h>
+#endif
+
 #include <yaz/backend.h>
 #include <rset.h>
 
@@ -172,9 +189,7 @@
 #include "zebraapi.h"
 #include "zinfo.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+YAZ_BEGIN_CDECL
 
 typedef struct {
     int sysno;
@@ -190,43 +205,82 @@ typedef struct zebra_rank_class {
     struct zebra_rank_class *next;
 } *ZebraRankClass;
 
-struct zebra_info {
-    int registerState; /* 0 (no commit pages), 1 (use commit pages) */
-    time_t registerChange;
-    ZebraSet sets;
-    Dict dict;
-    SortIdx sortIdx;
+struct zebra_service {
+    char *configName;
+    struct zebra_session *sessions;
     ISAMS isams;
 #if ZMBOL
     ISAM isam;
     ISAMC isamc;
+    ISAMD isamd;
 #endif
+    Dict dict;
+    SortIdx sortIdx;
+    int registerState; /* 0 (no commit pages), 1 (use commit pages) */
+    time_t registerChange;
+    BFiles bfs;
     Records records;
-    int errCode;
-    int hits;
-    char *errString;
     ZebraExplainInfo zei;
-    data1_handle dh;
-    BFiles bfs;
     Res res;
-
     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;
     RecTypes recTypes;
     Passwd_db passwd_db;
+    Zebra_mutex_cond session_lock;
+    int stop_flag;
+    int active;
+};
+
+struct recKeys {
+    int buf_used;
+    int buf_max;
+    char *buf;
+    char prevAttrSet;
+    short prevAttrUse;
+    int prevSeqNo;
+};
+
+struct sortKey {
+    char *string;
+    int length;
+    int attrSet;
+    int attrUse;
+    struct sortKey *next;
+};
+
+struct zebra_session {
+    struct zebra_session *next;
+    struct zebra_service *service;
+
+    struct recKeys keys;
+    struct sortKey *sortKeys;
+
+    char **key_buf;
+    size_t ptr_top;
+    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 {
     char *name;
-    void *(*create)(ZebraHandle zh);
-    void (*destroy)(ZebraHandle zh, void *class_handle);
+    void *(*create)(ZebraService zh);
+    void (*destroy)(ZebraService zh, void *class_handle);
     void *(*begin)(ZebraHandle zh, void *class_handle, RSET rset);
     void (*end)(ZebraHandle zh, void *set_handle);
     int (*calc)(void *set_handle, int sysno);
@@ -273,11 +327,11 @@ void zebra_sort (ZebraHandle zh, ODR stream,
 		 const char *output_setname, Z_SortKeySpecList *sort_sequence,
 		 int *sort_status);
 
-int zebra_server_lock_init (ZebraHandle zh);
-int zebra_server_lock_destroy (ZebraHandle zh);
-int zebra_server_lock (ZebraHandle zh, int lockCommit);
-void zebra_server_unlock (ZebraHandle zh, int commitPhase);
-int zebra_server_lock_get_state (ZebraHandle zh, time_t *timep);
+int zebra_server_lock_init (ZebraService zh);
+int zebra_server_lock_destroy (ZebraService zh);
+int zebra_server_lock (ZebraService zh, int lockCommit);
+void zebra_server_unlock (ZebraService zh, int commitPhase);
+int zebra_server_lock_get_state (ZebraService zh, time_t *timep);
 
 typedef struct attent
 {
@@ -285,9 +339,9 @@ typedef struct attent
     data1_local_attribute *local_attributes;
 } attent;
 
-void zebraRankInstall (ZebraHandle zh, struct rank_control *ctrl);
+void zebraRankInstall (ZebraService zh, struct rank_control *ctrl);
 ZebraRankClass zebraRankLookup (ZebraHandle zh, const char *name);
-void zebraRankDestroy (ZebraHandle zh);
+void zebraRankDestroy (ZebraService zh);
 
 int att_getentbyatt(ZebraHandle zh, attent *res, oid_value set, int att);
 
@@ -298,6 +352,25 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
 			oid_value *output_format, char **rec_bufp,
 			int *rec_lenp, char **basenamep);
 
-#ifdef __cplusplus
-}
-#endif
+void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no);
+void zebra_index_merge (ZebraHandle zh);
+
+
+struct zebra_fetch_control {
+    off_t offset_end;
+    off_t record_offset;
+    off_t record_int_pos;
+    const char *record_int_buf;
+    int record_int_len;
+    int fd;
+};
+
+int zebra_record_ext_read (void *fh, char *buf, size_t count);
+off_t zebra_record_ext_seek (void *fh, off_t offset);
+off_t zebra_record_ext_tell (void *fh);
+off_t zebra_record_int_seek (void *fh, off_t offset);
+off_t zebra_record_int_tell (void *fh);
+int zebra_record_int_read (void *fh, char *buf, size_t count);
+void zebra_record_int_end (void *fh, off_t offset);
+
+YAZ_END_CDECL