X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=b43fd4254d3f71195826e72d5e7c98e0a8fe5ef5;hb=5b886a7358c16434d5c9f5f0d4af2f6e2e5d5c73;hp=d65eebb99e49c882e613490b042762c7be27405f;hpb=003ed9e50b40a26c54bf79cab71bd26f7957b870;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index d65eebb..b43fd42 100644 --- a/index/index.h +++ b/index/index.h @@ -1,10 +1,69 @@ /* - * Copyright (C) 1994-1995, 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.40 1996-05-31 09:06:58 quinn + * 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 + * 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 + * Zebra version corresponds to YAZ version 1.4. + * Changed Zebra server so that it doesn't depend on global common_resource. + * + * Revision 1.49 1997/09/05 15:30:08 adam + * Changed prototype for chr_map_input - added const. + * Added support for C++, headers uses extern "C" for public definitions. + * + * Revision 1.48 1997/02/12 20:39:45 adam + * Implemented options -f that limits the log to the first + * records. + * Changed some log messages also. + * + * Revision 1.47 1996/12/23 15:30:44 adam + * Work on truncation. + * Bug fix: result sets weren't deleted after server shut down. + * + * Revision 1.46 1996/11/08 11:10:19 adam + * Buffers used during file match got bigger. + * Compressed ISAM support everywhere. + * Bug fixes regarding masking characters in queries. + * Redesigned Regexp-2 queries. + * + * Revision 1.45 1996/10/29 14:09:42 adam + * Use of cisam system - enabled if setting isamc is 1. + * + * Revision 1.44 1996/06/06 12:08:40 quinn + * Added showRecord function + * + * Revision 1.43 1996/06/04 10:18:12 adam + * Search/scan uses character mapping module. + * + * Revision 1.42 1996/06/04 08:20:16 quinn + * Smallish + * + * Revision 1.41 1996/06/04 07:54:55 quinn + * Added output-map. + * + * Revision 1.40 1996/05/31 09:06:58 quinn * Work on character-set handling * * Revision 1.39 1996/05/14 14:04:33 adam @@ -142,20 +201,25 @@ * New simple file index tool. * */ - #include #include -#include +#include +#include + #include #include +#include +#include #define IT_MAX_WORD 256 #define IT_KEY_HAVE_SEQNO 1 #define IT_KEY_HAVE_FIELD 0 +typedef int SYSNO; + struct it_key { int sysno; - int seqno; + int seqno; }; enum dirsKind { dirs_dir, dirs_file }; @@ -173,19 +237,25 @@ struct dirs_entry { time_t mtime; }; + struct recordGroup { - char *groupName; - char *databaseName; - char *path; - char *recordId; - char *recordType; - int flagStoreData; - int flagStoreKeys; - int fileVerboseFlag; + char *groupName; + char *databaseName; + char *path; + char *recordId; + char *recordType; + int flagStoreData; + int flagStoreKeys; + 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); @@ -204,20 +274,21 @@ void repositoryAdd (struct recordGroup *rGroup); void repositoryDelete (struct recordGroup *rGroup); void repositoryShow (struct recordGroup *rGroup); -void key_open (int mem); +int key_open (BFiles bfs, int mem, int rw); int key_close (void); -void key_write (int cmd, struct it_key *k, const char *str); 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); -void inv_prstat (const char *dict_fname, const char *isam_fname); -void key_input (const char *dict_fname, const char *isam_fname, - int nkeys, int cache); +void inv_prstat (BFiles bfs); +void key_input (BFiles bfs, int nkeys, int cache); +ISAMC_M key_isamc_m (Res res); int merge_sort (char **buf, int from, int to); -#define TEMP_FNAME "keys%d.tmp" -#define FNAME_WORD_DICT "worddict" -#define FNAME_WORD_ISAM "wordisam" +#define FNAME_DICT "dict" +#define FNAME_ISAM "isam" +#define FNAME_ISAMC "isamc" #define FNAME_CONFIG "zebra.cfg" #define GMATCH_DICT "gmatch" @@ -235,13 +306,9 @@ 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 (char *pathPrefix); - void zebraIndexLockMsg (const char *str); void zebraIndexUnlock (void); -void zebraIndexLock (int commitNow); +void zebraIndexLock (BFiles bfs, int commitNow, const char *rval); int zebraIndexWait (int commitPhase); #define FNAME_MAIN_LOCK "zebraidx.LCK" @@ -249,9 +316,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(void); -char **map_chrs_input(char **from, int len); +extern Res common_resource;