X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=7a5152c4ffbe3af833b831e93ca452f7aab35c11;hb=2eacaa1e549428b231de5844f397466f6a44c59f;hp=cafe44df76813484132385f17f4a7286e67bd93b;hpb=5a8a42bede922e70156e7b289db071592c71529b;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index cafe44d..7a5152c 100644 --- a/index/index.h +++ b/index/index.h @@ -1,4 +1,4 @@ -/* $Id: index.h,v 1.190 2007-01-15 20:08:25 adam Exp $ +/* $Id: index.h,v 1.202 2007-10-29 16:57:52 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,6 +144,7 @@ struct zebra_register { char *server_path_prefix; data1_handle dh; + zebra_index_types_t index_types; ZebraMaps zebra_maps; ZebraRankClass rank_classes; RecTypes recTypes; @@ -198,8 +199,8 @@ struct zebra_session { char *user_perm; char *dbaccesslist; int errCode; - zint hits; char *errString; + int partial_result; #if HAVE_SYS_TIMES_H struct tms tms1; struct tms tms2; @@ -213,6 +214,7 @@ struct zebra_session { zint records_updated; zint records_deleted; zint records_processed; + zint records_skipped; char *record_encoding; yaz_iconv_t iconv_to_utf8; @@ -233,6 +235,9 @@ struct zebra_session { NMEM nmem_error; struct zebra_limit *m_limit; + + int (*break_handler_func)(void *client_data); + void *break_handler_data; }; @@ -257,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, - oid_value attributeSet, + const Odr_oid *attributeSet, NMEM stream, NMEM rset_nmem, Z_SortKeySpecList *sort_sequence, int num_bases, char **basenames, @@ -267,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, - oid_value attributeset, + const Odr_oid *attributeset, int num_bases, char **basenames, int *position, int *num_entries, ZebraScanEntry **list, int *is_partial, RSET limit_set); @@ -276,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, @@ -285,8 +290,9 @@ void resultSetAddTerm(ZebraHandle zh, ZebraSet s, int reg_type, ZebraSet resultSetAdd(ZebraHandle zh, const char *name, int ov); ZebraSet resultSetGet(ZebraHandle zh, const char *name); ZEBRA_RES resultSetAddRPN(ZebraHandle zh, NMEM m, Z_RPNQuery *rpn, - int num_bases, char **basenames, - const char *setname); + int num_bases, char **basenames, + const char *setname, + zint *hits, int *estimated_hit_count); RSET resultSetRef(ZebraHandle zh, const char *resultSetId); void resultSetDestroy(ZebraHandle zh, int num_names, char **names, int *statuses); @@ -302,38 +308,42 @@ 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, - 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, - char **addinfo); +int zebra_record_fetch(ZebraHandle zh, const char *setname, + zint sysno, int score, + zebra_snippets *hit_snippet, ODR stream, + 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, const char *buf, size_t buf_size, - int delete_flag, + enum zebra_recctrl_action_t action, int test_mode, const char *recordType, zint *sysno, const char *match_criteria, - const char *fname, - int force_update, - int allow_update); + const char *fname); ZEBRA_RES zebra_extract_record_stream(ZebraHandle zh, struct ZebraRecStream *stream, - int delete_flag, + enum zebra_recctrl_action_t action, int test_mode, const char *recordType, zint *sysno, const char *match_criteria, const char *fname, - int force_update, - int allow_update, RecType recType, void *recTypeClientData, int *more); @@ -376,16 +386,16 @@ void zebra_term_untrans(ZebraHandle zh, int reg_type, ZEBRA_RES zebra_apt_get_ord(ZebraHandle zh, Z_AttributesPlusTerm *zapt, - int index_type, + const char *index_type, const char *xpath_use, - oid_value 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, - oid_value curAttributeSet, + const char *index_type, + const Odr_oid *curAttributeSet, int *ord); ZEBRA_RES zebra_sort_get_ord(ZebraHandle zh, @@ -411,6 +421,8 @@ ZEBRA_RES zapt_term_to_utf8(ZebraHandle zh, Z_AttributesPlusTerm *zapt, char *termz); +void zebra_set_partial_result(ZebraHandle zh); + int zebra_check_res(Res res); #define FIRST_IN_FIELD_STR "\001^"