X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=5f15228fe9ccdbb2161f68f8463c5eadeae9e452;hb=593927cb1897c1e3163c284448eff7fee6ddad51;hp=27c4aa233c3f5572d3c006801de46516e2b9773f;hpb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index 27c4aa2..5f15228 100644 --- a/index/index.h +++ b/index/index.h @@ -1,4 +1,4 @@ -/* $Id: index.h,v 1.129 2005-01-15 19:38:25 adam Exp $ +/* $Id: index.h,v 1.153 2005-10-28 07:25:30 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -24,8 +24,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define INDEX_H #include +#include #include -#include +#include #include #if HAVE_SYS_TIMES_H @@ -53,7 +54,7 @@ YAZ_BEGIN_CDECL #define IT_MAX_WORD 256 -#define IT_KEY_LEVEL_MAX 4 +#define IT_KEY_LEVEL_MAX 5 struct it_key { int len; zint mem[IT_KEY_LEVEL_MAX]; @@ -77,7 +78,7 @@ struct dirs_entry { void getFnameTmp (Res res, char *fname, int no); struct dirs_info *dirs_open (Dict dict, const char *rep, int rw); -struct dirs_info *dirs_fopen (Dict dict, const char *path); +struct dirs_info *dirs_fopen (Dict dict, const char *path, int rw); 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); @@ -191,18 +192,28 @@ typedef struct zebra_rank_class { struct zebra_rank_class *next; } *ZebraRankClass; +#define NEW_REC_KEYS 1 + +#if NEW_REC_KEYS +#include "reckeys.h" +#else struct recKeys { int buf_used; int buf_max; char *buf; void *codec_handle; }; +#endif + +#if NATTR +#else struct sortKeys { int buf_used; int buf_max; char *buf; }; +#endif struct zebra_register { char *name; @@ -229,11 +240,16 @@ struct zebra_register { int stop_flag; int active; /* 0=shutdown, 1=enabled and inactive, 2=activated */ +#if NEW_REC_KEYS + zebra_rec_keys_t keys; +#else struct recKeys keys; -#if 1 - struct sortKeys sortKeys; +#endif + +#if NATTR + struct recKeys sortKeys; #else - struct sortKey *sortKeys; + struct sortKeys sortKeys; #endif char **key_buf; size_t ptr_top; @@ -245,11 +261,11 @@ struct zebra_register { struct zebra_service { int stop_flag; Res global_res; - char *configName; struct zebra_session *sessions; struct zebra_register *regs; Zebra_mutex_cond session_lock; Passwd_db passwd_db; + Res dbaccess; const char *path_root; RecTypeClass record_classes; NMEM nmem; @@ -265,6 +281,7 @@ struct zebra_session { char **basenames; int num_basenames; + zint approx_limit; char *reg_name; char *path_reg; @@ -277,7 +294,9 @@ struct zebra_session { int destroyed; ZebraSet sets; Res res; + Res session_res; char *user_perm; + char *dbaccesslist; int errCode; zint hits; char *errString; @@ -287,6 +306,8 @@ struct zebra_session { #endif int shadow_enable; + int m_staticrank; + zint records_inserted; zint records_updated; zint records_deleted; @@ -305,6 +326,12 @@ struct zebra_session { int m_explain_database; int m_flag_rw; int m_file_verbose_limit; + + void *store_data_buf; + size_t store_data_size; + NMEM nmem_error; + + struct zebra_limit *m_limit; }; struct rank_control { @@ -320,7 +347,8 @@ struct rank_control { * int rssize; // number of records in result set (estimate?) */ void (*end)(struct zebra_register *reg, void *set_handle); - int (*calc)(void *set_handle, zint sysno); + int (*calc)(void *set_handle, zint sysno, zint staticrank, + int *stop_flag); void (*add)(void *set_handle, int seqno, TERMID term); }; @@ -334,41 +362,57 @@ struct term_set_list { struct term_set_entry *last; }; -RSET rpn_search (ZebraHandle zh, NMEM mem, NMEM rset_nmem, - Z_RPNQuery *rpn, int num_bases, char **basenames, - const char *setname, ZebraSet sset); +void zebra_limit_destroy(struct zebra_limit *zl); +struct zebra_limit *zebra_limit_create(int exclude_flag, zint *ids); +void zebra_limit_for_rset(struct zebra_limit *zl, + int (**filter_func)(const void *buf, void *data), + void (**filter_destroy)(void *data), + void **filter_data); + +struct rset_key_control *zebra_key_control_create(ZebraHandle zh); + +ZEBRA_RES rpn_search_top(ZebraHandle zh, Z_RPNStructure *zs, + oid_value attributeSet, + NMEM stream, NMEM rset_nmem, + Z_SortKeySpecList *sort_sequence, + int num_bases, char **basenames, + RSET *result_set); -void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, - oid_value attributeset, - int num_bases, char **basenames, - int *position, int *num_entries, ZebraScanEntry **list, - int *is_partial, RSET limit_set, int return_zero); +ZEBRA_RES rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, + oid_value attributeset, + int num_bases, char **basenames, + int *position, int *num_entries, ZebraScanEntry **list, + int *is_partial, RSET limit_set, int return_zero); -RSET rset_trunc (ZebraHandle zh, ISAMS_P *isam_p, int no, - const char *term, int length_term, const char *flags, - int preserve_position, int term_type, NMEM rset_nmem, - const struct key_control *kctrl, int scope); +RSET rset_trunc(ZebraHandle zh, ISAM_P *isam_p, int no, + const char *term, int length_term, const char *flags, + int preserve_position, int term_type, NMEM rset_nmem, + struct rset_key_control *kctrl, int scope, + struct ord_list *ol, int reg_type, + zint hits_limit, const char *term_ref_id); void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type, const char *db, int set, int use, const char *term); ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov); ZebraSet resultSetGet (ZebraHandle zh, const char *name); -ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn, - int num_bases, char **basenames, - const char *setname); +ZEBRA_RES resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn, + int num_bases, char **basenames, + const char *setname); RSET resultSetRef (ZebraHandle zh, const char *resultSetId); void resultSetDestroy (ZebraHandle zh, int num_names, char **names, int *statuses); -void resultSetSort (ZebraHandle zh, NMEM nmem, - int num_input_setnames, const char **input_setnames, - const char *output_setname, - Z_SortKeySpecList *sort_sequence, int *sort_status); -void resultSetSortSingle (ZebraHandle zh, NMEM nmem, - ZebraSet sset, RSET rset, - Z_SortKeySpecList *sort_sequence, int *sort_status); -void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset, NMEM nmem); +ZEBRA_RES resultSetSort (ZebraHandle zh, NMEM nmem, + int num_input_setnames, const char **input_setnames, + const char *output_setname, + Z_SortKeySpecList *sort_sequence, int *sort_status); +ZEBRA_RES resultSetSortSingle (ZebraHandle zh, NMEM nmem, + ZebraSet sset, RSET rset, + Z_SortKeySpecList *sort_sequence, + int *sort_status); +ZEBRA_RES resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset, + NMEM nmem); void resultSetInvalidate (ZebraHandle zh); int zebra_server_lock_init (ZebraService zh); @@ -390,11 +434,12 @@ void zebraRankDestroy (struct zebra_register *reg); 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; +extern struct rank_control *rank_1_class; +extern struct rank_control *rank_zv_class; +extern struct rank_control *rank_static_class; -int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream, +int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, + zebra_snippets *hit_snippet, ODR stream, oid_value input_format, Z_RecordComposition *comp, oid_value *output_format, char **rec_bufp, int *rec_lenp, char **basenamep, @@ -404,16 +449,16 @@ void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no); 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); +ZEBRA_RES 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, @@ -442,10 +487,38 @@ off_t zebra_record_int_tell (void *fh); int zebra_record_int_read (void *fh, char *buf, size_t count); void zebra_record_int_end (void *fh, off_t offset); +#if NEW_REC_KEYS +void print_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys); +#else +void print_rec_keys(ZebraHandle zh, struct recKeys *reckeys); +#endif + +#if NEW_REC_KEYS +ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys, + zebra_snippets *snippets); +#else +ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, struct recKeys *reckeys, + zebra_snippets *snippets); +#endif +ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname, + zint sysno, zebra_snippets *snippets); + +#if NEW_REC_KEYS +void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, + int cmd, zebra_rec_keys_t reckeys, + zint staticrank); +#else void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, - int cmd, struct recKeys *reckeys); + int cmd, struct recKeys *reckeys, + zint staticrank); +#endif +#if NATTR +void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, + int cmd, struct recKeys *skp); +#else void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, int cmd, struct sortKeys *skp); +#endif void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid); void extract_token_add (RecWord *p); int explain_extract (void *handle, Record rec, data1_node *n); @@ -453,8 +526,8 @@ int explain_extract (void *handle, Record rec, data1_node *n); int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname, int deleteFlag); -int zebra_begin_read (ZebraHandle zh); -int zebra_end_read (ZebraHandle zh); +ZEBRA_RES zebra_begin_read (ZebraHandle zh); +ZEBRA_RES zebra_end_read (ZebraHandle zh); int zebra_file_stat (const char *file_name, struct stat *buf, int follow_links); @@ -470,6 +543,17 @@ void iscz1_encode (void *vp, char **dst, const char **src); Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw, int compact_flag, Res res); +void zebra_setError(ZebraHandle zh, int code, const char *addinfo); +void zebra_setError_zint(ZebraHandle zh, int code, zint i); + +void zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream, int reg_type, + char **dst, const char *src); + +ZEBRA_RES zebra_get_hit_vector(ZebraHandle zh, const char *setname, zint sysno); + +void zebra_term_untrans(ZebraHandle zh, int reg_type, + char *dst, const char *src); + YAZ_END_CDECL #endif