X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=afb416e03145f64982a85801d9ba14fc0b91750a;hb=b24dc9a2d7ed255ed3b4f4ba35f11656aa89ef03;hp=099e21b5d607ee035e85d26e6ed5a3fede5eb1ae;hpb=959c65fe556f2937a2c0afc7741c473a0fe1a808;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index 099e21b..afb416e 100644 --- a/index/index.h +++ b/index/index.h @@ -1,5 +1,5 @@ -/* $Id: index.h,v 1.88 2002-10-16 09:30:57 heikki Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 +/* $Id: index.h,v 1.109 2004-06-14 10:31:56 mike Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 Index Data Aps This file is part of the Zebra server. @@ -43,7 +43,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #define ISAM_DEFAULT "c" -#include +#include #include #include "recindex.h" #include "zebraapi.h" @@ -98,25 +98,26 @@ struct dir_entry *dir_open (const char *rep, const char *base, void dir_sort (struct dir_entry *e); void dir_free (struct dir_entry **e_p); -void repositoryUpdate (ZebraHandle zh); -void repositoryAdd (ZebraHandle zh); -void repositoryDelete (ZebraHandle zh); -void repositoryShow (ZebraHandle zh); +void repositoryUpdate (ZebraHandle zh, const char *path); +void repositoryAdd (ZebraHandle zh, const char *path); +void repositoryDelete (ZebraHandle zh, const char *path); +void repositoryShow (ZebraHandle zh, const char *path); int key_open (ZebraHandle zh, int mem); int key_close (ZebraHandle zh); int key_compare (const void *p1, const void *p2); char *key_print_it (const void *p, char *buf); -int key_get_pos (const void *p); +int key_get_seq (const void *p); int key_compare_it (const void *p1, const void *p2); int key_qsort_compare (const void *p1, const void *p2); void key_logdump (int mask, const void *p); +void key_logdump_txt (int logmask, const void *p, const char *txt); void inv_prstat (ZebraHandle zh); void inv_compact (BFiles bfs); void key_input (ZebraHandle zh, int nkeys, int cache, Res res); -ISAMS_M key_isams_m (Res res, ISAMS_M me); -ISAMC_M key_isamc_m (Res res, ISAMC_M me); -ISAMD_M key_isamd_m (Res res, ISAMD_M me); +ISAMS_M *key_isams_m (Res res, ISAMS_M *me); +ISAMC_M *key_isamc_m (Res res, ISAMC_M *me); +ISAMD_M *key_isamd_m (Res res, ISAMD_M *me); int merge_sort (char **buf, int from, int to); int key_SU_code (int ch, char *out); @@ -170,8 +171,6 @@ void zebra_load_atts (data1_handle dh, Res res); int key_SU_decode (int *ch, const unsigned char *out); int key_SU_encode (int ch, char *out); -// extern Res common_resource; - #define ENCODE_BUFLEN 768 struct encode_info { int sysno; /* previously written values for delta-compress */ @@ -214,6 +213,13 @@ struct recKeys { int prevSeqNo; }; +#if 1 +struct sortKeys { + int buf_used; + int buf_max; + char *buf; +}; +#else struct sortKey { char *string; int length; @@ -221,6 +227,7 @@ struct sortKey { int attrUse; struct sortKey *next; }; +#endif struct zebra_register { char *name; @@ -249,11 +256,12 @@ struct zebra_register { int stop_flag; int active; /* 0=shutdown, 1=enabled and inactive, 2=activated */ - - struct recKeys keys; +#if 1 + struct sortKeys sortKeys; +#else struct sortKey *sortKeys; - +#endif char **key_buf; size_t ptr_top; size_t ptr_i; @@ -269,7 +277,7 @@ struct zebra_service { struct zebra_register *regs; Zebra_mutex_cond session_lock; Passwd_db passwd_db; - char *path_root; + const char *path_root; }; @@ -278,7 +286,7 @@ struct zebra_session { struct zebra_service *service; struct zebra_register *reg; - char *admin_databaseName; + char *xadmin_databaseName; char **basenames; int num_basenames; @@ -289,9 +297,12 @@ struct zebra_session { ZebraLockHandle lock_shadow; int trans_no; + int trans_w_no; + int destroyed; ZebraSet sets; Res res; + char *user_perm; int errCode; int hits; char *errString; @@ -299,7 +310,6 @@ struct zebra_session { struct tms tms1; struct tms tms2; #endif - struct recordGroup rGroup; int shadow_enable; int records_inserted; @@ -310,13 +320,28 @@ struct zebra_session { yaz_iconv_t iconv_to_utf8; yaz_iconv_t iconv_from_utf8; + + int m_follow_links; + const char *m_group; + const char *m_record_id; + const char *m_record_type; + int m_store_data; + int m_store_keys; + int m_explain_database; + int m_flag_rw; + int m_file_verbose_limit; }; struct rank_control { char *name; - void *(*create)(struct zebra_register *reg); + void *(*create)(ZebraHandle zh); void (*destroy)(struct zebra_register *reg, void *class_handle); void *(*begin)(struct zebra_register *reg, void *class_handle, RSET rset); + /* ### Could add parameters to begin: + * char *index; // author, title, etc. + * int dbsize; // number of records in database + * int rssize; // number of records in result set (estimate?) + */ void (*end)(struct zebra_register *reg, void *set_handle); int (*calc)(void *set_handle, int sysno); void (*add)(void *set_handle, int seqno, int term_index); @@ -341,7 +366,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, oid_value attributeset, int num_bases, char **basenames, int *position, int *num_entries, ZebraScanEntry **list, - int *is_partial); + int *is_partial, RSET limit_set, int return_zero); RSET rset_trunc (ZebraHandle zh, ISAMS_P *isam_p, int no, const char *term, int length_term, const char *flags, @@ -352,10 +377,10 @@ void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type, int use, const char *term); ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov); ZebraSet resultSetGet (ZebraHandle zh, const char *name); -ZebraSet resultSetAddRPN (ZebraHandle zh, ODR stream, ODR decode, - Z_RPNQuery *rpn, int num_bases, - char **basenames, const char *setname); -RSET resultSetRef (ZebraHandle zh, Z_ResultSetId *resultSetId); +ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn, + int num_bases, char **basenames, + const char *setname); +RSET resultSetRef (ZebraHandle zh, const char *resultSetId); void resultSetDestroy (ZebraHandle zh, int num_names, char **names, int *statuses); @@ -390,9 +415,12 @@ void zebraRankInstall (struct zebra_register *reg, struct rank_control *ctrl); ZebraRankClass zebraRankLookup (ZebraHandle zh, const char *name); void zebraRankDestroy (struct zebra_register *reg); -int att_getentbyatt(ZebraHandle zh, attent *res, oid_value set, int att); +int att_getentbyatt(ZebraHandle zh, attent *res, oid_value set, int att, + const char *sattr); extern struct rank_control *rank1_class; +extern struct rank_control *rankzv_class; +extern struct rank_control *rankliv_class; int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream, oid_value input_format, Z_RecordComposition *comp, @@ -400,17 +428,29 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream, int *rec_lenp, char **basenamep); void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no); -void zebra_index_merge (ZebraHandle zh); +void zebra_index_merge (ZebraHandle zh); +int buffer_extract_record (ZebraHandle zh, + const char *buf, size_t buf_size, + int delete_flag, + int test_mode, + const char *recordType, + int *sysno, + const char *match_criteria, + const char *fname, + int force_update, + int allow_update); + +#if 0 int extract_rec_in_mem (ZebraHandle zh, const char *recordType, const char *buf, size_t buf_size, const char *databaseName, int delete_flag, int test_mode, int *sysno, int store_keys, int store_data, const char *match_criteria); - -void extract_flushWriteKeys (ZebraHandle zh); +#endif +void extract_flushWriteKeys (ZebraHandle zh, int final); struct zebra_fetch_control { off_t offset_end; @@ -432,20 +472,29 @@ void zebra_record_int_end (void *fh, off_t offset); void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, int cmd, struct recKeys *reckeys); void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, - int cmd, struct sortKey **skp); + int cmd, struct sortKeys *skp); void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid); void extract_token_add (RecWord *p); int explain_extract (void *handle, Record rec, data1_node *n); int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname, - const struct recordGroup *rGroup, int deleteFlag); + int deleteFlag); int zebra_begin_read (ZebraHandle zh); -void zebra_end_read (ZebraHandle zh); +int zebra_end_read (ZebraHandle zh); int zebra_file_stat (const char *file_name, struct stat *buf, int follow_links); +void zebra_livcode_transform(ZebraHandle zh, Z_RPNQuery *query); + +void *iscz1_code_start (int mode); +void iscz1_code_reset (void *vp); +void iscz1_code_stop (int mode, void *p); +void iscz1_code_item (int mode, void *vp, char **dst, char **src); + + + YAZ_END_CDECL #endif