X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=efabadf092c60b5b412b38145b1c2f8434752a7c;hb=856d020355a71f37c0b55564f97d52072646b7c8;hp=7d6e2b9343983a496b61dd4512041f296d6a10bc;hpb=4a617d48ef8d8516c83bf49fac1206b580ba537e;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index 7d6e2b9..efabadf 100644 --- a/index/index.h +++ b/index/index.h @@ -1,5 +1,5 @@ -/* $Id: index.h,v 1.87 2002-09-03 11:44:54 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 +/* $Id: index.h,v 1.102 2003-06-23 15:35:25 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 Index Data Aps This file is part of the Zebra server. @@ -43,7 +43,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #define ISAM_DEFAULT "c" -#include +#include #include #include "recindex.h" #include "zebraapi.h" @@ -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); @@ -170,18 +170,22 @@ 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); -// extern Res common_resource; - +#define ENCODE_BUFLEN 768 struct encode_info { - int sysno; + int sysno; /* previously written values for delta-compress */ int seqno; int cmd; - char buf[768]; + int prevsys; /* buffer for skipping insert/delete pairs */ + int prevseq; + int prevcmd; + int keylen; /* tells if we have an unwritten key in buf, and how long*/ + char buf[ENCODE_BUFLEN]; }; void encode_key_init (struct encode_info *i); 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; @@ -208,6 +212,13 @@ struct recKeys { int prevSeqNo; }; +#if 1 +struct sortKeys { + int buf_used; + int buf_max; + char *buf; +}; +#else struct sortKey { char *string; int length; @@ -215,6 +226,7 @@ struct sortKey { int attrUse; struct sortKey *next; }; +#endif struct zebra_register { char *name; @@ -243,11 +255,12 @@ struct zebra_register { int stop_flag; int active; /* 0=shutdown, 1=enabled and inactive, 2=activated */ - - struct recKeys keys; +#if 1 + struct sortKeys sortKeys; +#else struct sortKey *sortKeys; - +#endif char **key_buf; size_t ptr_top; size_t ptr_i; @@ -283,6 +296,8 @@ struct zebra_session { ZebraLockHandle lock_shadow; int trans_no; + int trans_w_no; + int destroyed; ZebraSet sets; Res res; @@ -308,7 +323,7 @@ struct zebra_session { 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); @@ -335,7 +350,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, @@ -346,10 +361,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); @@ -387,6 +402,8 @@ void zebraRankDestroy (struct zebra_register *reg); 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, @@ -396,6 +413,17 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream, 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, + int force_update, + int allow_update); int extract_rec_in_mem (ZebraHandle zh, const char *recordType, const char *buf, size_t buf_size, @@ -403,7 +431,6 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType, int test_mode, int *sysno, int store_keys, int store_data, const char *match_criteria); - void extract_flushWriteKeys (ZebraHandle zh); struct zebra_fetch_control { @@ -426,7 +453,7 @@ void zebra_record_int_end (void *fh, off_t offset); void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, int cmd, struct recKeys *reckeys); void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, - int cmd, struct sortKey **skp); + int cmd, struct sortKeys *skp); 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); @@ -435,11 +462,13 @@ int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname, const struct recordGroup *rGroup, 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