X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Findex.h;h=c87fc735108c74745a8f4b8776212672b58ba686;hp=2c38a58577d2bb73ac2458ad454b4dca1679875e;hb=05b9b8ed020c5bfa48a913d6a2e2b50ddf1bab8e;hpb=f7e93f016e75e43d037b5c3e89aeb27b7176513a diff --git a/index/index.h b/index/index.h index 2c38a58..c87fc73 100644 --- a/index/index.h +++ b/index/index.h @@ -1,4 +1,4 @@ -/* $Id: index.h,v 1.111 2004-08-06 13:14:46 adam Exp $ +/* $Id: index.h,v 1.127 2004-12-08 12:23:09 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -24,9 +24,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define INDEX_H #include -#include +#include #include -#include #include #if HAVE_SYS_TIMES_H @@ -34,14 +33,14 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #endif #include -#include +#include #include #include #include -#include -#include +#include +#include #include "recindex.h" -#include "zebraapi.h" +#include #include "zinfo.h" #include #include @@ -54,24 +53,11 @@ YAZ_BEGIN_CDECL #define IT_MAX_WORD 256 -#define IT_KEY_NEW 1 - -#if IT_KEY_NEW - -#endif - -#if IT_KEY_NEW #define IT_KEY_LEVEL_MAX 4 struct it_key { int len; zint mem[IT_KEY_LEVEL_MAX]; }; -#else -struct it_key { - int sysno; - int seqno; -}; -#endif enum dirsKind { dirs_dir, dirs_file }; @@ -115,7 +101,7 @@ int key_close (ZebraHandle zh); int key_compare (const void *p1, const void *p2); void key_init(struct it_key *k); char *key_print_it (const void *p, char *buf); -int key_get_seq (const void *p); +zint 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); @@ -187,9 +173,7 @@ struct encode_info { int prevseq; int prevcmd; int keylen; /* tells if we have an unwritten key in buf, and how long*/ -#if IT_KEY_NEW void *encode_handle; -#endif char buf[ENCODE_BUFLEN]; }; @@ -198,13 +182,6 @@ char *encode_key_int (int d, char *bp); void encode_key_write (char *k, struct encode_info *i, FILE *outf); void encode_key_flush (struct encode_info *i, FILE *outf); -typedef struct { - char *term; - char *db; - int sysno; - int score; -} *ZebraPosSet; - typedef struct zebra_set *ZebraSet; typedef struct zebra_rank_class { @@ -218,13 +195,7 @@ struct recKeys { int buf_used; int buf_max; char *buf; -#if IT_KEY_NEW void *codec_handle; -#else - int prevSeqNo; - char prevAttrSet; - short prevAttrUse; -#endif }; struct sortKeys { @@ -280,6 +251,8 @@ struct zebra_service { Zebra_mutex_cond session_lock; Passwd_db passwd_db; const char *path_root; + RecTypeClass record_classes; + NMEM nmem; }; @@ -306,7 +279,7 @@ struct zebra_session { Res res; char *user_perm; int errCode; - int hits; + zint hits; char *errString; #if HAVE_SYS_TIMES_H struct tms tms1; @@ -314,10 +287,10 @@ struct zebra_session { #endif int shadow_enable; - int records_inserted; - int records_updated; - int records_deleted; - int records_processed; + zint records_inserted; + zint records_updated; + zint records_deleted; + zint records_processed; char *record_encoding; yaz_iconv_t iconv_to_utf8; @@ -338,7 +311,9 @@ 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); + 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 @@ -346,7 +321,7 @@ struct rank_control { */ void (*end)(struct zebra_register *reg, void *set_handle); int (*calc)(void *set_handle, zint sysno); - void (*add)(void *set_handle, int seqno, int term_index); + void (*add)(void *set_handle, int seqno, TERMID term); }; struct term_set_entry { @@ -359,7 +334,7 @@ struct term_set_list { struct term_set_entry *last; }; -RSET rpn_search (ZebraHandle zh, NMEM mem, +RSET rpn_search (ZebraHandle zh, NMEM mem, NMEM rset_nmem, Z_RPNQuery *rpn, int num_bases, char **basenames, const char *setname, ZebraSet sset); @@ -372,7 +347,8 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, RSET rset_trunc (ZebraHandle zh, ISAMS_P *isam_p, int no, const char *term, int length_term, const char *flags, - int preserve_position, int term_type); + int preserve_position, int term_type, NMEM rset_nmem, + const struct key_control *kctrl, int scope); void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type, const char *db, int set, @@ -385,12 +361,6 @@ ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn, RSET resultSetRef (ZebraHandle zh, const char *resultSetId); void resultSetDestroy (ZebraHandle zh, int num_names, char **names, int *statuses); - - -ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name, - int num, int *positions); -void zebraPosSetDestroy (ZebraHandle zh, ZebraPosSet records, int num); - void resultSetSort (ZebraHandle zh, NMEM nmem, int num_input_setnames, const char **input_setnames, const char *output_setname, @@ -398,7 +368,7 @@ void resultSetSort (ZebraHandle zh, NMEM nmem, void resultSetSortSingle (ZebraHandle zh, NMEM nmem, ZebraSet sset, RSET rset, Z_SortKeySpecList *sort_sequence, int *sort_status); -void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset); +void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset, NMEM nmem); void resultSetInvalidate (ZebraHandle zh); int zebra_server_lock_init (ZebraService zh); @@ -427,7 +397,8 @@ extern struct rank_control *rankliv_class; int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream, oid_value input_format, Z_RecordComposition *comp, oid_value *output_format, char **rec_bufp, - int *rec_lenp, char **basenamep); + int *rec_lenp, char **basenamep, + char **addinfo); void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no); @@ -496,6 +467,9 @@ void iscz1_stop (void *p); void iscz1_decode (void *vp, char **dst, const char **src); void iscz1_encode (void *vp, char **dst, const char **src); +Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw, + int compact_flag, Res res); + YAZ_END_CDECL #endif