X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=8e7b995fc1a81fa571219bc73bd956f3aa06810e;hb=ecf94fc25324414287d3bbfbeba4440e558edd17;hp=7359cfce316334a2656d175b30d3c7bdbeb1c674;hpb=230fdc17aa503a23c842cd587f241cfe2fce1c0d;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index 7359cfc..8e7b995 100644 --- a/index/index.h +++ b/index/index.h @@ -1,6 +1,6 @@ -/* $Id: index.h,v 1.116 2004-08-31 14:43:41 heikki Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps +/* $Id: index.h,v 1.132 2005-04-13 13:03:47 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -24,9 +24,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define INDEX_H #include +#include #include -#include -#include +#include #include #if HAVE_SYS_TIMES_H @@ -34,12 +34,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #endif #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "recindex.h" #include #include "zinfo.h" @@ -54,31 +54,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 - -struct key_info { - int keysize; - int (*key_compare) (const void *p1, const void *p2); - void (*key_logdump_txt) (int logmask, const void *p, const char *txt); - /* FIXME - decode and encode, and lots of other stuff */ -}; enum dirsKind { dirs_dir, dirs_file }; @@ -122,7 +102,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); @@ -194,9 +174,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]; }; @@ -205,13 +183,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; - zint sysno; - int score; -} *ZebraPosSet; - typedef struct zebra_set *ZebraSet; typedef struct zebra_rank_class { @@ -225,13 +196,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 { @@ -287,6 +252,8 @@ struct zebra_service { Zebra_mutex_cond session_lock; Passwd_db passwd_db; const char *path_root; + RecTypeClass record_classes; + NMEM nmem; }; @@ -345,7 +312,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 @@ -353,7 +322,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 { @@ -377,9 +346,10 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, int *position, int *num_entries, ZebraScanEntry **list, int *is_partial, RSET limit_set, int return_zero); -RSET rset_trunc (ZebraHandle zh, ISAMS_P *isam_p, int no, +RSET rset_trunc (ZebraHandle zh, ISAM_P *isam_p, int no, const char *term, int length_term, const char *flags, - int preserve_position, int term_type, NMEM rset_nmem); + 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, @@ -392,12 +362,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, @@ -405,7 +369,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); @@ -434,7 +398,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); @@ -503,6 +468,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