X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=dcb408d03df5c6f941cc0ee6651a6f7e16541a1a;hb=6b553b7b42f0a2940c9765b9811e5db44ba8265f;hp=cf13c2d35d515160b53ee32fc143d141d945c13a;hpb=ca39c711e9398043092cceeb3b4a7d8a0db1c0d8;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index cf13c2d..dcb408d 100644 --- a/index/index.h +++ b/index/index.h @@ -1,4 +1,4 @@ -/* $Id: index.h,v 1.182 2006-11-21 14:32:38 adam Exp $ +/* $Id: index.h,v 1.185 2006-11-30 10:33:19 adam Exp $ Copyright (C) 1995-2006 Index Data ApS @@ -66,7 +66,7 @@ struct dir_entry { struct dirs_entry { enum dirsKind kind; char path[256]; - SYSNO sysno; + zint sysno; time_t mtime; }; @@ -78,12 +78,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 +107,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" @@ -272,6 +261,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, @@ -308,7 +300,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 +316,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 +327,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 +349,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);