-/* $Id: index.h,v 1.182 2006-11-21 14:32:38 adam Exp $
- Copyright (C) 1995-2006
+/* $Id: index.h,v 1.197 2007-04-16 08:44:31 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
#endif
#include <sys/stat.h>
+#include <yaz/timing.h>
#include <idzebra/dict.h>
#include <idzebra/isams.h>
#include <idzebra/isamc.h>
struct dirs_entry {
enum dirsKind kind;
char path[256];
- SYSNO sysno;
+ zint sysno;
time_t mtime;
};
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);
#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"
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;
const char *path_root;
RecTypeClass record_classes;
NMEM nmem;
+ yaz_timing_t timing;
};
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;
zint records_updated;
zint records_deleted;
zint records_processed;
+ zint records_skipped;
char *record_encoding;
yaz_iconv_t iconv_to_utf8;
NMEM nmem_error;
struct zebra_limit *m_limit;
+
+ int (*break_handler_func)(void *client_data);
+ void *break_handler_data;
};
struct rset_key_control *zebra_key_control_create(ZebraHandle zh);
ZEBRA_RES rpn_search_top(ZebraHandle zh, Z_RPNStructure *zs,
- oid_value attributeSet,
+ const int *attributeSet,
NMEM stream, NMEM rset_nmem,
Z_SortKeySpecList *sort_sequence,
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,
+ const int *attributeset,
int num_bases, char **basenames,
int *position, int *num_entries, ZebraScanEntry **list,
int *is_partial, RSET limit_set);
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);
NMEM nmem);
void resultSetInvalidate(ZebraHandle zh);
-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,
- char **addinfo);
+int zebra_record_fetch(ZebraHandle zh, zint sysno, int score,
+ zebra_snippets *hit_snippet, ODR stream,
+ const int *input_format, Z_RecordComposition *comp,
+ const int **output_format, char **rec_bufp,
+ int *rec_lenp, char **basenamep,
+ char **addinfo);
void extract_get_fname_tmp(ZebraHandle zh, char *fname, int no);
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,
- SYSNO *sysno,
+ 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,
- 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);
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);
Z_AttributesPlusTerm *zapt,
int index_type,
const char *xpath_use,
- oid_value curAttributeSet,
+ const int *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 int *curAttributeSet,
int *ord);
ZEBRA_RES zebra_sort_get_ord(ZebraHandle zh,
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
projects / idzebra-moved-to-github.git / blobdiff