X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=76e1bd49bf50dc9ab563ae554c5349434e07c0a4;hb=bfe7ce5c9c47f3f4ad1ac76d4232b9807d5ee158;hp=07392a16f37e963abf7842379fbd69ec1336a832;hpb=1872e3fc60b482771bbd1cb4b0290b8d6a9ef5d0;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index 07392a1..76e1bd4 100644 --- a/index/index.h +++ b/index/index.h @@ -1,4 +1,4 @@ -/* $Id: index.h,v 1.197 2007-04-16 08:44:31 adam Exp $ +/* $Id: index.h,v 1.206 2007-11-01 14:56:07 adam Exp $ Copyright (C) 1995-2007 Index Data ApS @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include - +#include #if HAVE_SYS_TIMES_H #include #endif @@ -144,7 +144,8 @@ struct zebra_register { char *server_path_prefix; data1_handle dh; - ZebraMaps zebra_maps; + zebra_index_types_t index_types; + zebra_maps_t zebra_maps; ZebraRankClass rank_classes; RecTypes recTypes; int seqno; @@ -261,7 +262,7 @@ void zebra_limit_for_rset(struct zebra_limit *zl, struct rset_key_control *zebra_key_control_create(ZebraHandle zh); ZEBRA_RES rpn_search_top(ZebraHandle zh, Z_RPNStructure *zs, - const int *attributeSet, + const Odr_oid *attributeSet, NMEM stream, NMEM rset_nmem, Z_SortKeySpecList *sort_sequence, int num_bases, char **basenames, @@ -271,7 +272,7 @@ ZEBRA_RES rpn_get_top_approx_limit(ZebraHandle zh, Z_RPNStructure *zs, zint *approx_limit); ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, - const int *attributeset, + const Odr_oid *attributeset, int num_bases, char **basenames, int *position, int *num_entries, ZebraScanEntry **list, int *is_partial, RSET limit_set); @@ -280,7 +281,7 @@ 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, + struct ord_list *ol, const char *index_type, zint hits_limit, const char *term_ref_id); void resultSetAddTerm(ZebraHandle zh, ZebraSet s, int reg_type, @@ -307,15 +308,23 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet, RSET rset, NMEM nmem); void resultSetInvalidate(ZebraHandle zh); -int zebra_record_fetch(ZebraHandle zh, zint sysno, int score, +int zebra_record_fetch(ZebraHandle zh, const char *setname, + zint sysno, int score, zebra_snippets *hit_snippet, ODR stream, - const int *input_format, Z_RecordComposition *comp, - const int **output_format, char **rec_bufp, + const Odr_oid *input_format, Z_RecordComposition *comp, + const Odr_oid **output_format, char **rec_bufp, int *rec_lenp, char **basenamep, char **addinfo); void extract_get_fname_tmp(ZebraHandle zh, char *fname, int no); +void extract_snippet(ZebraHandle zh, zebra_snippets *sn, + struct ZebraRecStream *stream, RecType rt, + void *recTypeClientData); + +int zebra_get_rec_snippets(ZebraHandle zh, zint sysno, + zebra_snippets *snippets); + void zebra_index_merge(ZebraHandle zh); ZEBRA_RES zebra_buffer_extract_record(ZebraHandle zh, @@ -367,26 +376,27 @@ Dict dict_open_res(BFiles bfs, const char *name, int cache, int rw, 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, +void zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream, + const char *index_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, +void zebra_term_untrans(ZebraHandle zh, const char *index_type, char *dst, const char *src); ZEBRA_RES zebra_apt_get_ord(ZebraHandle zh, Z_AttributesPlusTerm *zapt, - int index_type, + const char *index_type, const char *xpath_use, - const int *curAttributeSet, + const Odr_oid *curAttributeSet, int *ord); ZEBRA_RES zebra_attr_list_get_ord(ZebraHandle zh, Z_AttributeList *attr_list, zinfo_index_category_t cat, - int index_type, - const int *curAttributeSet, + const char *index_type, + const Odr_oid *curAttributeSet, int *ord); ZEBRA_RES zebra_sort_get_ord(ZebraHandle zh, @@ -401,11 +411,11 @@ ZEBRA_RES zebra_remove_file_match(ZebraHandle zh); struct rpn_char_map_info { - ZebraMaps zm; + zebra_map_t zm; int reg_type; }; -void rpn_char_map_prepare(struct zebra_register *reg, int reg_type, +void rpn_char_map_prepare(struct zebra_register *reg, zebra_map_t zm, struct rpn_char_map_info *map_info); ZEBRA_RES zapt_term_to_utf8(ZebraHandle zh, Z_AttributesPlusTerm *zapt, @@ -420,6 +430,21 @@ int zebra_check_res(Res res); #define FIRST_IN_FIELD_CHAR 1 #define FIRST_IN_FIELD_LEN 2 +ZEBRA_RES zebra_term_limits_APT(ZebraHandle zh, + Z_AttributesPlusTerm *zapt, + zint *hits_limit_value, + const char **term_ref_id_str, + NMEM nmem); + +ZEBRA_RES rpn_facet(ZebraHandle zh, ODR stream, NMEM nmem, + struct rset_key_control *kc, + Z_AttributesPlusTerm *zapt, + int *position, int *num_entries, + ZebraScanEntry **list, + int *is_partial, RSET limit_set, + const char *index_type, + int ord_no, int *ords); + YAZ_END_CDECL #endif