X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=a1bee7e41fc4d2ae74a66955066ebec6823b6636;hb=9b4f970d2816490fa4cc850fabc51f494ee5612b;hp=a4c2f247f5f98332e2b58f0c8514aef96193c5b8;hpb=b718b0a9f4aaf52d38031bfb82d0d539e50332d6;p=idzebra-moved-to-github.git diff --git a/index/zserver.h b/index/zserver.h index a4c2f24..a1bee7e 100644 --- a/index/zserver.h +++ b/index/zserver.h @@ -1,10 +1,30 @@ /* - * 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.44 1999-11-04 15:00:45 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. + * + * 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 * Implemented delete result set(s). * * Revision 1.43 1999/07/14 10:59:27 adam @@ -160,7 +180,11 @@ #include #endif -#include +#if HAVE_PTHREADS_H +#include +#endif + +#include #include #include @@ -169,9 +193,7 @@ #include "zebraapi.h" #include "zinfo.h" -#ifdef __cplusplus -extern "C" { -#endif +YAZ_BEGIN_CDECL typedef struct { int sysno; @@ -187,41 +209,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; - ISAMS isams; + 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; /* 0=shutdown, 1=enabled and inactive, 2=activated */ +}; + +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); @@ -239,7 +302,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, int *position, int *num_entries, ZebraScanEntry **list, int *is_partial); -RSET rset_trunc (ZebraHandle zh, ISAM_P *isam_p, int no, +RSET rset_trunc (ZebraHandle zh, ISAMS_P *isam_p, int no, const char *term, int length_term, const char *flags); ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov); @@ -268,11 +331,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 { @@ -280,9 +343,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); @@ -293,6 +356,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