X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=2b25cdf4216702e3c318192a542361965716fa63;hb=eaa8c71186392f0d2a1ab714dc6f3f0a4da71d03;hp=0b7f3106da38b0a03037a11f3e7015dfc7209403;hpb=45554249f7785e31125a062dc410a93ef693f574;p=idzebra-moved-to-github.git diff --git a/index/zserver.h b/index/zserver.h index 0b7f310..2b25cdf 100644 --- a/index/zserver.h +++ b/index/zserver.h @@ -1,10 +1,33 @@ /* - * Copyright (C) 1994-1996, 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.21 1996-10-29 14:09:58 adam + * Revision 1.27 1997-10-27 14:33:06 adam + * Moved towards generic character mapping depending on "structure" + * field in abstract syntax file. Fixed a few memory leaks. Fixed + * bug with negative integers when doing searches with relational + * operators. + * + * Revision 1.26 1997/09/29 12:41:35 adam + * Fixed bug regarding USE_TIMES var. + * + * 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 @@ -73,6 +96,19 @@ * */ + +#ifndef USE_TIMES +#ifdef __linux__ +#define USE_TIMES 1 +#else +#define USE_TIMES 0 +#endif +#endif + +#if USE_TIMES +#include +#endif + #include #include @@ -103,6 +139,19 @@ typedef struct { 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; +#if USE_TIMES + struct tms tms1; + struct tms tms2; +#endif + ZebraMaps zebra_maps; } ZServerInfo; int rpn_search (ZServerInfo *zi, @@ -115,14 +164,28 @@ int rpn_scan (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, 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 zebraServerLock (int lockCommit); -void zebraServerUnlock (int commitPhase); -int zebraServerLockGetState (time_t *timep); +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);