X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=54ffa5214fd0fbc13e124464749b36cde6261840;hb=23b1af194b14847f3ba187e3c5c3015797ad3c4a;hp=8b21f91c65a62b9a0f07cc9d12af57e0676bc929;hpb=fc9684841bbfad0b625e7365b99bae7b7df737df;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index 8b21f91..54ffa52 100644 --- a/index/index.h +++ b/index/index.h @@ -1,5 +1,5 @@ -/* $Id: index.h,v 1.94 2003-03-04 23:30:20 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 +/* $Id: index.h,v 1.104 2004-01-22 15:40:25 heikki Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 Index Data Aps This file is part of the Zebra server. @@ -98,10 +98,10 @@ 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); @@ -114,9 +114,9 @@ void key_logdump (int mask, const void *p); 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 +276,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 +285,7 @@ struct zebra_session { struct zebra_service *service; struct zebra_register *reg; - char *admin_databaseName; + char *xadmin_databaseName; char **basenames; int num_basenames; @@ -308,7 +308,6 @@ struct zebra_session { struct tms tms1; struct tms tms2; #endif - struct recordGroup rGroup; int shadow_enable; int records_inserted; @@ -319,11 +318,21 @@ 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); void (*end)(struct zebra_register *reg, void *set_handle); @@ -350,7 +359,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, @@ -361,10 +370,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); @@ -403,6 +412,7 @@ int att_getentbyatt(ZebraHandle zh, attent *res, oid_value set, int att); 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, @@ -410,25 +420,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); +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; @@ -456,14 +470,16 @@ 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); + YAZ_END_CDECL #endif