X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=7a66bad8ea8e80a9d93c2bcb0ea134ee5f0975d2;hb=538b41355b5607b4bd09c9c98682694fd6628940;hp=cf13c2d35d515160b53ee32fc143d141d945c13a;hpb=ca39c711e9398043092cceeb3b4a7d8a0db1c0d8;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index cf13c2d..7a66bad 100644 --- a/index/index.h +++ b/index/index.h @@ -1,5 +1,5 @@ -/* $Id: index.h,v 1.182 2006-11-21 14:32:38 adam Exp $ - Copyright (C) 1995-2006 +/* $Id: index.h,v 1.193 2007-01-17 13:22:53 adam Exp $ + Copyright (C) 1995-2007 Index Data ApS This file is part of the Zebra server. @@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #endif #include +#include #include #include #include @@ -66,7 +67,7 @@ struct dir_entry { struct dirs_entry { enum dirsKind kind; char path[256]; - SYSNO sysno; + zint sysno; time_t mtime; }; @@ -78,12 +79,12 @@ 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, SYSNO sysno, time_t mtime); +void dirs_add(struct dirs_info *p, const char *src, zint sysno, time_t mtime); void dirs_del(struct dirs_info *p, const char *src); void dirs_free(struct dirs_info **pp); struct dir_entry *dir_open(const char *rep, const char *base, - int follow_links); + int follow_links); void dir_sort(struct dir_entry *e); void dir_free(struct dir_entry **e_p); @@ -107,17 +108,6 @@ ISAMC_M *key_isamc_m(Res res, ISAMC_M *me); #define GMATCH_DICT "gmatch" #define FMATCH_DICT "fmatch%d" -struct strtab *strtab_mk(void); -int strtab_src(struct strtab *t, const char *name, void ***infop); -void strtab_del(struct strtab *t, - void (*func)(const char *name, void *info, void *data), - void *data); - -void zebraIndexLockMsg(ZebraHandle zh, const char *str); -void zebraIndexUnlock(ZebraHandle zh); -int zebraIndexLock(BFiles bfs, ZebraHandle zh, int commitNow, const char *rval); -int zebraIndexWait(ZebraHandle zh, int commitPhase); - void zebra_lock_prefix(Res res, char *dst); #define FNAME_MAIN_LOCK "zebraidx.LCK" @@ -145,7 +135,7 @@ struct zebra_register { ISAMB isamb; Dict dict; Dict matchDict; - SortIdx sortIdx; + zebra_sort_index_t sort_index; int registerState; /* 0 (no commit pages), 1 (use commit pages) */ time_t registerChange; BFiles bfs; @@ -178,6 +168,7 @@ struct zebra_service { const char *path_root; RecTypeClass record_classes; NMEM nmem; + yaz_timing_t timing; }; @@ -207,8 +198,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; @@ -242,6 +233,9 @@ struct zebra_session { NMEM nmem_error; struct zebra_limit *m_limit; + + int (*busy_handler_func)(void *client_data); + void *busy_handler_data; }; @@ -272,6 +266,9 @@ ZEBRA_RES rpn_search_top(ZebraHandle zh, Z_RPNStructure *zs, int num_bases, char **basenames, RSET *result_set); +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, int num_bases, char **basenames, @@ -291,8 +288,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); @@ -308,7 +306,7 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet, RSET rset, NMEM nmem); void resultSetInvalidate(ZebraHandle zh); -int zebra_record_fetch(ZebraHandle zh, SYSNO sysno, int score, +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, @@ -324,7 +322,7 @@ ZEBRA_RES zebra_buffer_extract_record(ZebraHandle zh, int delete_flag, int test_mode, const char *recordType, - SYSNO *sysno, + zint *sysno, const char *match_criteria, const char *fname, int force_update, @@ -335,13 +333,14 @@ ZEBRA_RES zebra_extract_record_stream(ZebraHandle zh, int delete_flag, int test_mode, const char *recordType, - SYSNO *sysno, + zint *sysno, const char *match_criteria, const char *fname, int force_update, int allow_update, RecType recType, - void *recTypeClientData); + void *recTypeClientData, + int *more); YAZ_EXPORT void zebra_create_stream_mem(struct ZebraRecStream *stream, const char *buf, size_t sz); @@ -356,7 +355,7 @@ ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname, ZEBRA_RES zebra_extract_explain(void *handle, Record rec, data1_node *n); -ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname, +ZEBRA_RES zebra_extract_file(ZebraHandle zh, zint *sysno, const char *fname, int deleteFlag); ZEBRA_RES zebra_begin_read(ZebraHandle zh); @@ -416,6 +415,10 @@ 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^" #define FIRST_IN_FIELD_CHAR 1 #define FIRST_IN_FIELD_LEN 2