X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=588f96c12ad54519534b5214fb5eba32fba7d117;hb=3ffa2e910d57f2842c7e9ed12b3f60d24e187826;hp=5f15228fe9ccdbb2161f68f8463c5eadeae9e452;hpb=593927cb1897c1e3163c284448eff7fee6ddad51;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index 5f15228..588f96c 100644 --- a/index/index.h +++ b/index/index.h @@ -1,4 +1,4 @@ -/* $Id: index.h,v 1.153 2005-10-28 07:25:30 adam Exp $ +/* $Id: index.h,v 1.160 2006-05-10 08:13:21 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 @@ -141,25 +142,13 @@ 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); @@ -175,6 +164,7 @@ struct encode_info { int prevcmd; int keylen; /* tells if we have an unwritten key in buf, and how long*/ void *encode_handle; + void *decode_handle; char buf[ENCODE_BUFLEN]; }; @@ -192,18 +182,7 @@ typedef struct zebra_rank_class { struct zebra_rank_class *next; } *ZebraRankClass; -#define NEW_REC_KEYS 1 - -#if NEW_REC_KEYS #include "reckeys.h" -#else -struct recKeys { - int buf_used; - int buf_max; - char *buf; - void *codec_handle; -}; -#endif #if NATTR @@ -238,16 +217,11 @@ struct zebra_register { int seqno; int last_val; int stop_flag; - int active; /* 0=shutdown, 1=enabled and inactive, 2=activated */ -#if NEW_REC_KEYS zebra_rec_keys_t keys; -#else - struct recKeys keys; -#endif #if NATTR - struct recKeys sortKeys; + zebra_rec_keys_t sortKeys; #else struct sortKeys sortKeys; #endif @@ -334,23 +308,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; @@ -427,17 +384,9 @@ typedef struct attent 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, @@ -487,34 +436,19 @@ off_t zebra_record_int_tell (void *fh); int zebra_record_int_read (void *fh, char *buf, size_t count); void zebra_record_int_end (void *fh, off_t offset); -#if NEW_REC_KEYS void print_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys); -#else -void print_rec_keys(ZebraHandle zh, struct recKeys *reckeys); -#endif -#if NEW_REC_KEYS ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys, zebra_snippets *snippets); -#else -ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, struct recKeys *reckeys, - zebra_snippets *snippets); -#endif ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname, zint sysno, zebra_snippets *snippets); -#if NEW_REC_KEYS void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, int cmd, zebra_rec_keys_t reckeys, zint staticrank); -#else -void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, - int cmd, struct recKeys *reckeys, - zint staticrank); -#endif #if NATTR void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, - int cmd, struct recKeys *skp); + int cmd, zebra_rec_keys_t skp); #else void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, int cmd, struct sortKeys *skp); @@ -523,8 +457,8 @@ 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); @@ -557,3 +491,11 @@ void zebra_term_untrans(ZebraHandle zh, int reg_type, YAZ_END_CDECL #endif +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +