X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=43661a8e303ffbf11c44763a2eabd36e7e8296f5;hb=ec214819d7b9e2f5c362584d8e38f83e13aae600;hp=fb865b50d4f81802fc78020cd68673f710d9ed83;hpb=104beff061317519411d779c7c84419ccdfc70e1;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index fb865b5..43661a8 100644 --- a/index/index.h +++ b/index/index.h @@ -1,5 +1,5 @@ -/* $Id: index.h,v 1.101 2003-06-20 14:21:23 heikki Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 +/* $Id: index.h,v 1.114 2004-08-25 09:23:36 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps This file is part of the Zebra server. @@ -20,13 +20,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - - #ifndef INDEX_H #define INDEX_H #include -#include +#include #include #include #include @@ -38,33 +36,42 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#include #include -#include #include -#define ISAM_DEFAULT "c" #include #include #include "recindex.h" -#include "zebraapi.h" +#include #include "zinfo.h" #include #include YAZ_BEGIN_CDECL +#define ISAM_DEFAULT "b" + #define SU_SCHEME 1 #define IT_MAX_WORD 256 -#define IT_KEY_HAVE_SEQNO 1 -#define IT_KEY_HAVE_FIELD 0 -typedef int SYSNO; +#define IT_KEY_NEW 1 + +#if IT_KEY_NEW + +#endif +#if IT_KEY_NEW +#define IT_KEY_LEVEL_MAX 4 +struct it_key { + int len; + zint mem[IT_KEY_LEVEL_MAX]; +}; +#else struct it_key { int sysno; int seqno; }; +#endif enum dirsKind { dirs_dir, dirs_file }; @@ -89,7 +96,7 @@ struct dirs_entry *dirs_read (struct dirs_info *p); struct dirs_entry *dirs_last (struct dirs_info *p); void dirs_mkdir (struct dirs_info *p, const char *src, time_t mtime); void dirs_rmdir (struct dirs_info *p, const char *src); -void dirs_add (struct dirs_info *p, const char *src, int sysno, time_t mtime); +void dirs_add (struct dirs_info *p, const char *src, SYSNO sysno, time_t mtime); void dirs_del (struct dirs_info *p, const char *src); void dirs_free (struct dirs_info **pp); @@ -98,25 +105,26 @@ struct dir_entry *dir_open (const char *rep, const char *base, void dir_sort (struct dir_entry *e); void dir_free (struct dir_entry **e_p); -void repositoryUpdate (ZebraHandle zh); -void repositoryAdd (ZebraHandle zh); -void repositoryDelete (ZebraHandle zh); -void repositoryShow (ZebraHandle zh); +void repositoryUpdate (ZebraHandle zh, const char *path); +void repositoryAdd (ZebraHandle zh, const char *path); +void repositoryDelete (ZebraHandle zh, const char *path); +void repositoryShow (ZebraHandle zh, const char *path); int key_open (ZebraHandle zh, int mem); int key_close (ZebraHandle zh); int key_compare (const void *p1, const void *p2); +void key_init(struct it_key *k); char *key_print_it (const void *p, char *buf); -int key_get_pos (const void *p); +int key_get_seq (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 key_logdump_txt (int logmask, const void *p, const char *txt); void inv_prstat (ZebraHandle zh); void inv_compact (BFiles bfs); void key_input (ZebraHandle zh, int nkeys, int cache, Res res); -ISAMS_M key_isams_m (Res res, ISAMS_M me); -ISAMC_M key_isamc_m (Res res, ISAMC_M me); -ISAMD_M key_isamd_m (Res res, ISAMD_M me); +ISAMS_M *key_isams_m (Res res, ISAMS_M *me); +ISAMC_M *key_isamc_m (Res res, ISAMC_M *me); int merge_sort (char **buf, int from, int to); int key_SU_code (int ch, char *out); @@ -179,6 +187,9 @@ struct encode_info { int prevseq; int prevcmd; int keylen; /* tells if we have an unwritten key in buf, and how long*/ +#if IT_KEY_NEW + void *encode_handle; +#endif char buf[ENCODE_BUFLEN]; }; @@ -190,7 +201,7 @@ void encode_key_flush (struct encode_info *i, FILE *outf); typedef struct { char *term; char *db; - int sysno; + zint sysno; int score; } *ZebraPosSet; @@ -207,34 +218,26 @@ struct recKeys { int buf_used; int buf_max; char *buf; +#if IT_KEY_NEW + void *codec_handle; +#else + int prevSeqNo; char prevAttrSet; short prevAttrUse; - int prevSeqNo; +#endif }; -#if 1 struct sortKeys { int buf_used; int buf_max; char *buf; }; -#else -struct sortKey { - char *string; - int length; - int attrSet; - int attrUse; - struct sortKey *next; -}; -#endif struct zebra_register { char *name; ISAMS isams; - ISAM isam; ISAMC isamc; - ISAMD isamd; ISAMB isamb; Dict dict; Dict matchDict; @@ -276,7 +279,7 @@ struct zebra_service { struct zebra_register *regs; Zebra_mutex_cond session_lock; Passwd_db passwd_db; - char *path_root; + const char *path_root; }; @@ -285,7 +288,7 @@ struct zebra_session { struct zebra_service *service; struct zebra_register *reg; - char *admin_databaseName; + char *xadmin_databaseName; char **basenames; int num_basenames; @@ -301,24 +304,34 @@ struct zebra_session { int destroyed; ZebraSet sets; Res res; + char *user_perm; int errCode; - int hits; + zint hits; char *errString; #if HAVE_SYS_TIMES_H struct tms tms1; struct tms tms2; #endif - struct recordGroup rGroup; int shadow_enable; - int records_inserted; - int records_updated; - int records_deleted; - int records_processed; + zint records_inserted; + zint records_updated; + zint records_deleted; + zint records_processed; char *record_encoding; yaz_iconv_t iconv_to_utf8; yaz_iconv_t iconv_from_utf8; + + int m_follow_links; + const char *m_group; + const char *m_record_id; + const char *m_record_type; + int m_store_data; + int m_store_keys; + int m_explain_database; + int m_flag_rw; + int m_file_verbose_limit; }; struct rank_control { @@ -326,8 +339,13 @@ struct rank_control { void *(*create)(ZebraHandle zh); void (*destroy)(struct zebra_register *reg, void *class_handle); void *(*begin)(struct zebra_register *reg, void *class_handle, RSET rset); + /* ### Could add parameters to begin: + * char *index; // author, title, etc. + * int dbsize; // number of records in database + * int rssize; // number of records in result set (estimate?) + */ void (*end)(struct zebra_register *reg, void *set_handle); - int (*calc)(void *set_handle, int sysno); + int (*calc)(void *set_handle, zint sysno); void (*add)(void *set_handle, int seqno, int term_index); }; @@ -399,39 +417,42 @@ void zebraRankInstall (struct zebra_register *reg, struct rank_control *ctrl); ZebraRankClass zebraRankLookup (ZebraHandle zh, const char *name); void zebraRankDestroy (struct zebra_register *reg); -int att_getentbyatt(ZebraHandle zh, attent *res, oid_value set, int att); +int att_getentbyatt(ZebraHandle zh, attent *res, oid_value set, int att, + const char *sattr); extern struct rank_control *rank1_class; extern struct rank_control *rankzv_class; extern struct rank_control *rankliv_class; -int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream, +int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream, oid_value input_format, Z_RecordComposition *comp, 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); -int bufferExtractRecord (ZebraHandle zh, - const char *buf, size_t buf_size, - struct recordGroup *rGroup, - int delete_flag, - int test_mode, - const char *recordType, - int *sysno, - const char *match_criteria, - const char *fname, - int force_update, - int allow_update); +void zebra_index_merge (ZebraHandle zh); +int buffer_extract_record (ZebraHandle zh, + const char *buf, size_t buf_size, + int delete_flag, + int test_mode, + const char *recordType, + SYSNO *sysno, + const char *match_criteria, + const char *fname, + int force_update, + int allow_update); + +#if 0 int extract_rec_in_mem (ZebraHandle zh, const char *recordType, const char *buf, size_t buf_size, const char *databaseName, int delete_flag, int test_mode, int *sysno, int store_keys, int store_data, const char *match_criteria); -void extract_flushWriteKeys (ZebraHandle zh); +#endif +void extract_flushWriteKeys (ZebraHandle zh, int final); struct zebra_fetch_control { off_t offset_end; @@ -459,7 +480,7 @@ void extract_token_add (RecWord *p); int explain_extract (void *handle, Record rec, data1_node *n); int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname, - const struct recordGroup *rGroup, int deleteFlag); + int deleteFlag); int zebra_begin_read (ZebraHandle zh); int zebra_end_read (ZebraHandle zh); @@ -469,6 +490,12 @@ int zebra_file_stat (const char *file_name, struct stat *buf, void zebra_livcode_transform(ZebraHandle zh, Z_RPNQuery *query); +void *iscz1_start (); +void iscz1_reset (void *vp); +void iscz1_stop (void *p); +void iscz1_decode (void *vp, char **dst, const char **src); +void iscz1_encode (void *vp, char **dst, const char **src); + YAZ_END_CDECL #endif