X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=8da07ff5f247296c833723d598397562fcffeca9;hb=69da23537c6bb71ab948e079708bf8ea090de73f;hp=823ae2753324b9f890022605f41a7beb3738ace8;hpb=eb2b742588ce07fb4516bbca22c93b938b13e433;p=idzebra-moved-to-github.git diff --git a/index/zserver.h b/index/zserver.h index 823ae27..8da07ff 100644 --- a/index/zserver.h +++ b/index/zserver.h @@ -4,7 +4,14 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.h,v $ - * Revision 1.46 2000-03-15 15:00:31 adam + * 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 @@ -202,6 +209,7 @@ struct zebra_service { #if ZMBOL ISAM isam; ISAMC isamc; + ISAMD isamd; #endif Dict dict; SortIdx sortIdx; @@ -223,21 +231,47 @@ struct zebra_service { 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 { -#if HAVE_PTHREADS_H - pthread_t *pthread_session; -#endif struct zebra_session *next; - struct zebra_info *info; 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; - }; struct rank_control { @@ -315,4 +349,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); +void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no); +void zebra_index_merge (ZebraHandle zh); + + +struct zebra_fetch_control { + int offset_end; + int record_offset; + int 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