X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=149c57d5b50769798c891198806cfafb4ba6dd71;hb=87de7bf0ce46771f1bb2ea8272adfdb8100058e2;hp=a3f94269956a7ada9c0c687b40f4910577d39b88;hpb=b547f7eb4e4ae29d08a2c0fb7e2108b22ade3dd7;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index a3f9426..149c57d 100644 --- a/index/index.h +++ b/index/index.h @@ -1,5 +1,5 @@ -/* $Id: index.h,v 1.99 2003-05-20 12:52:49 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 +/* $Id: index.h,v 1.108 2004-06-09 13:11:49 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 Index Data Aps This file is part of the Zebra server. @@ -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); @@ -276,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; }; @@ -285,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; @@ -301,6 +302,7 @@ struct zebra_session { int destroyed; ZebraSet sets; Res res; + char *user_perm; int errCode; int hits; char *errString; @@ -308,7 +310,6 @@ struct zebra_session { struct tms tms1; struct tms tms2; #endif - struct recordGroup rGroup; int shadow_enable; int records_inserted; @@ -319,6 +320,16 @@ 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 { @@ -361,7 +372,7 @@ 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, Z_RPNQuery *rpn, +ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn, int num_bases, char **basenames, const char *setname); RSET resultSetRef (ZebraHandle zh, const char *resultSetId); @@ -399,7 +410,8 @@ 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; @@ -411,27 +423,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); -int bufferExtractRecord (ZebraHandle zh, - const char *buf, size_t buf_size, - struct recordGroup *rGroup, - int delete_flag, - int test_mode, - const char *recordType, - int *sysno, - const char *match_criteria, - const char *fname, - int force_update, - int allow_update); +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; @@ -459,16 +473,23 @@ 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