X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=b43fd4254d3f71195826e72d5e7c98e0a8fe5ef5;hb=5b886a7358c16434d5c9f5f0d4af2f6e2e5d5c73;hp=31fe3b3866b36191863a4c1222f437774e82ae83;hpb=c5ef994b26d692fbfecc3ac97f69e4bf7bd0fcea;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index 31fe3b3..b43fd42 100644 --- a/index/index.h +++ b/index/index.h @@ -1,10 +1,22 @@ /* - * Copyright (C) 1995-1997, Index Data I/S + * Copyright (C) 1995-1998, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: index.h,v $ - * Revision 1.53 1997-09-25 14:54:43 adam + * Revision 1.56 1998-01-12 15:04:08 adam + * The test option (-s) only uses read-lock (and not write lock). + * + * 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 @@ -192,6 +204,7 @@ #include #include #include +#include #include #include @@ -224,6 +237,7 @@ struct dirs_entry { time_t mtime; }; + struct recordGroup { char *groupName; char *databaseName; @@ -232,15 +246,16 @@ struct recordGroup { char *recordType; int flagStoreData; int flagStoreKeys; - int flagShowRecords; + int flagRw; int fileVerboseLimit; data1_handle dh; BFiles bfs; + ZebraMaps zebra_maps; }; void getFnameTmp (char *fname, int no); -struct dirs_info *dirs_open (Dict dict, const char *rep); +struct dirs_info *dirs_open (Dict dict, const char *rep, int rw); struct dirs_info *dirs_fopen (Dict dict, const char *path); struct dirs_entry *dirs_read (struct dirs_info *p); struct dirs_entry *dirs_last (struct dirs_info *p); @@ -259,7 +274,7 @@ void repositoryAdd (struct recordGroup *rGroup); void repositoryDelete (struct recordGroup *rGroup); void repositoryShow (struct recordGroup *rGroup); -void key_open (BFiles bfs, int mem); +int key_open (BFiles bfs, int mem, int rw); int key_close (void); int key_compare (const void *p1, const void *p2); int key_get_pos (const void *p); @@ -291,10 +306,6 @@ int index_word_prefix (char *string, int attset_ordinal, int fileExtract (SYSNO *sysno, const char *fname, const struct recordGroup *rGroup, int deleteFlag); -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); @@ -312,9 +323,7 @@ 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;