Fix leak for rset_key_control

[idzebra-moved-to-github.git] / index / index.h

diff --git a/index/index.h b/index/index.h
index 61fe3f4..5f15228 100644 (file)
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.138 2005-05-11 12:39:36 adam Exp $
+/* $Id: index.h,v 1.153 2005-10-28 07:25:30 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];
@@ -192,18 +192,28 @@ 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
 
+#else
 struct sortKeys {
     int buf_used;
     int buf_max;
     char *buf;
 };
+#endif
 
 struct zebra_register {
     char *name;
@@ -230,11 +240,16 @@ struct zebra_register {
     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;
-#if 1
-    struct sortKeys sortKeys;
+#endif
+
+#if NATTR
+    struct recKeys sortKeys;
 #else
-    struct sortKey *sortKeys;
+    struct sortKeys sortKeys;
 #endif
     char **key_buf;
     size_t ptr_top;
@@ -246,11 +261,11 @@ 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;
     Passwd_db passwd_db;
+    Res dbaccess;
     const char *path_root;
     RecTypeClass record_classes;
     NMEM nmem;
@@ -266,6 +281,7 @@ struct zebra_session {
 
     char **basenames;
     int num_basenames;
+    zint approx_limit;
     char *reg_name;
     char *path_reg;
 
@@ -278,7 +294,9 @@ struct zebra_session {
     int destroyed;
     ZebraSet sets;
     Res res;
+    Res session_res;
     char *user_perm;
+    char *dbaccesslist;
     int errCode;
     zint hits;
     char *errString;
@@ -288,6 +306,8 @@ struct zebra_session {
 #endif
     int  shadow_enable;
 
+    int m_staticrank;
+
     zint records_inserted;
     zint records_updated;
     zint records_deleted;
@@ -327,7 +347,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);
 };
 
@@ -364,10 +385,12 @@ ZEBRA_RES 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, ISAM_P *isam_p, int no,
-                const char *term, int length_term, const char *flags,
-                 int preserve_position, int term_type, NMEM rset_nmem,
-                 struct rset_key_control *kctrl, int scope);
+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,
+               struct rset_key_control *kctrl, int scope,
+               struct ord_list *ol, int reg_type,
+               zint hits_limit, const char *term_ref_id);
 
 void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type,
                       const char *db, int set,
@@ -411,11 +434,12 @@ 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, ODR stream,
+int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, 
+                       zebra_snippets *hit_snippet, ODR stream,
                        oid_value input_format, Z_RecordComposition *comp,
                        oid_value *output_format, char **rec_bufp,
                        int *rec_lenp, char **basenamep,
@@ -463,10 +487,38 @@ 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, struct recKeys *reckeys);
+                              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);
+#else
 void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
                             int cmd, struct sortKeys *skp);
+#endif
 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);
@@ -494,6 +546,14 @@ Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw,
 void zebra_setError(ZebraHandle zh, int code, const char *addinfo);
 void zebra_setError_zint(ZebraHandle zh, int code, zint i);
 
+void zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream, int reg_type,
+                             char **dst, const char *src);
+
+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