X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Findex.h;h=f795dafd31667ca2cb8a497cb71a27a527a60280;hp=f544d8b470ee13750588db795b3e2173c7586229;hb=e7cf9381a4b902cb2b91053f80ab7899b7d5bb00;hpb=289761234a123e7fb51df77ab9baf0a2cd101dbd diff --git a/index/index.h b/index/index.h index f544d8b..f795daf 100644 --- a/index/index.h +++ b/index/index.h @@ -1,4 +1,4 @@ -/* $Id: index.h,v 1.155 2006-02-20 18:39:43 adam Exp $ +/* $Id: index.h,v 1.164 2006-05-19 23:45:29 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -27,6 +27,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include +#include #include #if HAVE_SYS_TIMES_H @@ -131,37 +132,19 @@ 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); -int index_char_cvt (int c); -int index_word_prefix (char *string, int attset_ordinal, - int local_attribute, const char *databaseName); - 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" #define FNAME_COMMIT_LOCK "zebracmt.LCK" #define FNAME_ORG_LOCK "zebraorg.LCK" #define FNAME_TOUCH_TIME "zebraidx.time" -typedef struct zebra_lock_info *ZebraLockHandle; -ZebraLockHandle zebra_lock_create(const char *dir, - const char *file, int excl_flag); -void zebra_lock_destroy (ZebraLockHandle h); -int zebra_lock (ZebraLockHandle h); -int zebra_lock_nb (ZebraLockHandle h); -int zebra_unlock (ZebraLockHandle h); -int zebra_lock_fd (ZebraLockHandle h); -void zebra_lock_prefix (Res res, char *dst); -char *zebra_mk_fname (const char *dir, const char *name); - -int zebra_lock_w (ZebraLockHandle h); -int zebra_lock_r (ZebraLockHandle h); - -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); @@ -195,16 +178,6 @@ typedef struct zebra_rank_class { #include "reckeys.h" -#if NATTR - -#else -struct sortKeys { - int buf_used; - int buf_max; - char *buf; -}; -#endif - struct zebra_register { char *name; @@ -228,15 +201,9 @@ struct zebra_register { int seqno; int last_val; int stop_flag; - int active; /* 0=shutdown, 1=enabled and inactive, 2=activated */ zebra_rec_keys_t keys; - -#if NATTR zebra_rec_keys_t sortKeys; -#else - struct sortKeys sortKeys; -#endif char **key_buf; size_t ptr_top; size_t ptr_i; @@ -320,23 +287,6 @@ struct zebra_session { struct zebra_limit *m_limit; }; -struct rank_control { - char *name; - void *(*create)(ZebraHandle zh); - void (*destroy)(struct zebra_register *reg, void *class_handle); - void *(*begin)(struct zebra_register *reg, - void *class_handle, RSET rset, NMEM nmem, - TERMID *terms, int numterms); - /* ### 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, zint sysno, zint staticrank, - int *stop_flag); - void (*add)(void *set_handle, int seqno, TERMID term); -}; struct term_set_entry { char *term; @@ -378,9 +328,9 @@ RSET rset_trunc(ZebraHandle zh, ISAM_P *isam_p, int no, struct ord_list *ol, int reg_type, zint hits_limit, const char *term_ref_id); -void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type, - const char *db, int set, - int use, const char *term); +void resultSetAddTerm(ZebraHandle zh, ZebraSet s, int reg_type, + const char *db, const char *index_name, + const char *term); 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, @@ -407,23 +357,6 @@ int zebra_server_lock (ZebraService zh, int lockCommit); void zebra_server_unlock (ZebraService zh, int commitPhase); int zebra_server_lock_get_state (ZebraService zh, time_t *timep); -typedef struct attent -{ - int attset_ordinal; - data1_local_attribute *local_attributes; -} attent; - -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, - const char *sattr); - -extern struct rank_control *rank_1_class; -extern struct rank_control *rank_zv_class; -extern struct rank_control *rank_static_class; - int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, zebra_snippets *hit_snippet, ODR stream, oid_value input_format, Z_RecordComposition *comp, @@ -483,19 +416,14 @@ ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname, void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, int cmd, zebra_rec_keys_t reckeys, zint staticrank); -#if NATTR void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, int cmd, zebra_rec_keys_t skp); -#else -void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, - int cmd, struct sortKeys *skp); -#endif 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, - int deleteFlag); +ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname, + int deleteFlag); ZEBRA_RES zebra_begin_read (ZebraHandle zh); ZEBRA_RES zebra_end_read (ZebraHandle zh); @@ -525,6 +453,32 @@ ZEBRA_RES zebra_get_hit_vector(ZebraHandle zh, const char *setname, zint sysno); void zebra_term_untrans(ZebraHandle zh, int reg_type, char *dst, const char *src); +ZEBRA_RES zebra_apt_get_ord(ZebraHandle zh, + Z_AttributesPlusTerm *zapt, + int index_type, + const char *xpath_use, + oid_value curAttributeSet, + int *ord); + +ZEBRA_RES zebra_attr_list_get_ord(ZebraHandle zh, + Z_AttributeList *attr_list, + int index_type, + oid_value curAttributeSet, + int *ord); + +ZEBRA_RES zebra_sort_get_ord(ZebraHandle zh, + Z_SortAttributes *sortAttributes, + int *ord, + int *numerical); + YAZ_END_CDECL #endif +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +