X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=684b10efdae130185ad137b68e5cc8d481fc5c81;hb=b7942589b21cca1b6d44c7bf9446dcb6a5942953;hp=2ae3ab23c28500348680c5c61f440d8261c20eb3;hpb=fd12cf9b8e16c109f3c0f7aedb0e0efd65209e16;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index 2ae3ab2..684b10e 100644 --- a/index/index.h +++ b/index/index.h @@ -4,7 +4,22 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: index.h,v $ - * Revision 1.51 1997-09-18 08:59:19 adam + * Revision 1.55 1997-10-27 14:33:04 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.54 1997/09/29 09:08:36 adam + * Revised locking system to be thread safe for the server. + * + * Revision 1.53 1997/09/25 14:54:43 adam + * WIN32 files lock support. + * + * Revision 1.52 1997/09/22 12:39:06 adam + * Added get_pos method for the ranked result sets. + * + * Revision 1.51 1997/09/18 08:59:19 adam * Extra generic handle for the character mapping routines. * * Revision 1.50 1997/09/17 12:19:13 adam @@ -186,6 +201,7 @@ #include #include #include +#include #include #include @@ -218,6 +234,7 @@ struct dirs_entry { time_t mtime; }; + struct recordGroup { char *groupName; char *databaseName; @@ -230,6 +247,7 @@ struct recordGroup { int fileVerboseLimit; data1_handle dh; BFiles bfs; + ZebraMaps zebra_maps; }; void getFnameTmp (char *fname, int no); @@ -256,6 +274,7 @@ void repositoryShow (struct recordGroup *rGroup); void key_open (BFiles bfs, int mem); int key_close (void); int key_compare (const void *p1, const void *p2); +int key_get_pos (const void *p); int key_compare_it (const void *p1, const void *p2); int key_qsort_compare (const void *p1, const void *p2); void key_logdump (int mask, const void *p); @@ -286,8 +305,6 @@ int fileExtract (SYSNO *sysno, const char *fname, void rec_prstat (void); -void zebraLockPrefix (Res res, char *pathPrefix); - void zebraIndexLockMsg (const char *str); void zebraIndexUnlock (void); void zebraIndexLock (BFiles bfs, int commitNow, const char *rval); @@ -298,12 +315,14 @@ int zebraIndexWait (int commitPhase); #define FNAME_ORG_LOCK "zebraorg.LCK" #define FNAME_TOUCH_TIME "zebraidx.time" -int zebraLock (int fd, int wr); -int zebraLockNB (int fd, int wr); -int zebraUnlock (int fd); +typedef struct zebra_lock_info *ZebraLockHandle; +ZebraLockHandle zebra_lock_create(const char *file, int excl_flag); +void zebra_lock_destroy (ZebraLockHandle h); +int zebra_lock (ZebraLockHandle h); +int zebra_lock_nb (ZebraLockHandle h); +int zebra_unlock (ZebraLockHandle h); +int zebra_lock_fd (ZebraLockHandle h); +void zebra_lock_prefix (Res res, char *dst); -void init_charmap(Res res); -const char **map_chrs_input(void *vp, const char **from, int len); -const char *map_chrs_output(const char **from); extern Res common_resource;