X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=e058b3b5a9ea92269e992bffe27dfa418a6e720b;hb=2c5c76f0a69069ae2a448e9d4e7b46dcc04bf761;hp=3f952f2325bb53562c7598c2dfb24d9f456cf7f3;hpb=9eebf93dc2525854867cbc43920ea8ba4a199ab5;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index 3f952f2..e058b3b 100644 --- a/index/index.h +++ b/index/index.h @@ -1,4 +1,4 @@ -/* $Id: index.h,v 1.145 2005-06-23 06:45:46 adam Exp $ +/* $Id: index.h,v 1.151 2005-09-16 09:58:39 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -54,7 +54,7 @@ YAZ_BEGIN_CDECL #define IT_MAX_WORD 256 -#define IT_KEY_LEVEL_MAX 4 +#define IT_KEY_LEVEL_MAX 5 struct it_key { int len; zint mem[IT_KEY_LEVEL_MAX]; @@ -250,7 +250,6 @@ struct zebra_register { struct zebra_service { int stop_flag; Res global_res; - char *configName; struct zebra_session *sessions; struct zebra_register *regs; Zebra_mutex_cond session_lock; @@ -283,6 +282,7 @@ struct zebra_session { int destroyed; ZebraSet sets; Res res; + Res session_res; char *user_perm; int errCode; zint hits; @@ -293,6 +293,8 @@ struct zebra_session { #endif int shadow_enable; + int m_staticrank; + zint records_inserted; zint records_updated; zint records_deleted; @@ -332,7 +334,8 @@ struct rank_control { * 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); + int (*calc)(void *set_handle, zint sysno, zint staticrank, + int *stop_flag); void (*add)(void *set_handle, int seqno, TERMID term); }; @@ -418,9 +421,9 @@ 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 *rank1_class; -extern struct rank_control *rankzv_class; -extern struct rank_control *rankliv_class; +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, @@ -478,7 +481,8 @@ ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname, zint sysno, zebra_snippets *snippets); void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, - int cmd, struct recKeys *reckeys); + int cmd, struct recKeys *reckeys, + zint staticrank); #if NATTR void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, int cmd, struct recKeys *skp); @@ -518,6 +522,9 @@ void zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream, int reg_type, 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); + YAZ_END_CDECL #endif