projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
b1f5c48
..
5f15228
100644
(file)
--- a/
index/index.h
+++ b/
index/index.h
@@
-1,4
+1,4
@@
-/* $Id: index.h,v 1.150 2005-09-13 11:51:06 adam Exp $
+/* $Id: index.h,v 1.153 2005-10-28 07:25:30 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-192,12
+192,18
@@
typedef struct zebra_rank_class {
struct zebra_rank_class *next;
} *ZebraRankClass;
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;
};
struct recKeys {
int buf_used;
int buf_max;
char *buf;
void *codec_handle;
};
+#endif
#if NATTR
#if NATTR
@@
-234,7
+240,12
@@
struct zebra_register {
int stop_flag;
int active; /* 0=shutdown, 1=enabled and inactive, 2=activated */
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;
struct recKeys keys;
+#endif
+
#if NATTR
struct recKeys sortKeys;
#else
#if NATTR
struct recKeys sortKeys;
#else
@@
-254,6
+265,7
@@
struct zebra_service {
struct zebra_register *regs;
Zebra_mutex_cond session_lock;
Passwd_db passwd_db;
struct zebra_register *regs;
Zebra_mutex_cond session_lock;
Passwd_db passwd_db;
+ Res dbaccess;
const char *path_root;
RecTypeClass record_classes;
NMEM nmem;
const char *path_root;
RecTypeClass record_classes;
NMEM nmem;
@@
-284,6
+296,7
@@
struct zebra_session {
Res res;
Res session_res;
char *user_perm;
Res res;
Res session_res;
char *user_perm;
+ char *dbaccesslist;
int errCode;
zint hits;
char *errString;
int errCode;
zint hits;
char *errString;
@@
-474,15
+487,31
@@
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);
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);
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);
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);
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);
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);
#if NATTR
void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
int cmd, struct recKeys *skp);
@@
-522,6
+551,9
@@
void zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream, int reg_type,
ZEBRA_RES zebra_get_hit_vector(ZebraHandle zh, const char *setname, zint sysno);
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
YAZ_END_CDECL
#endif