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
Introduced zebra_map_t in zebra_maps API.
[idzebra-moved-to-github.git]
/
index
/
index.h
diff --git
a/index/index.h
b/index/index.h
index
1f6e466
..
a03ee21
100644
(file)
--- a/
index/index.h
+++ b/
index/index.h
@@
-1,4
+1,4
@@
-/* $Id: index.h,v 1.198 2007-05-08 12:50:04 adam Exp $
+/* $Id: index.h,v 1.203 2007-10-30 19:17:15 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
Copyright (C) 1995-2007
Index Data ApS
@@
-29,7
+29,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <idzebra/util.h>
#include <idzebra/flock.h>
#include <sortidx.h>
#include <idzebra/util.h>
#include <idzebra/flock.h>
#include <sortidx.h>
-
+#include <index_types.h>
#if HAVE_SYS_TIMES_H
#include <sys/times.h>
#endif
#if HAVE_SYS_TIMES_H
#include <sys/times.h>
#endif
@@
-144,7
+144,8
@@
struct zebra_register {
char *server_path_prefix;
data1_handle dh;
char *server_path_prefix;
data1_handle dh;
- ZebraMaps zebra_maps;
+ zebra_index_types_t index_types;
+ zebra_maps_t zebra_maps;
ZebraRankClass rank_classes;
RecTypes recTypes;
int seqno;
ZebraRankClass rank_classes;
RecTypes recTypes;
int seqno;
@@
-280,7
+281,7
@@
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,
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,
+ struct ord_list *ol, const char *index_type,
zint hits_limit, const char *term_ref_id);
void resultSetAddTerm(ZebraHandle zh, ZebraSet s, int reg_type,
zint hits_limit, const char *term_ref_id);
void resultSetAddTerm(ZebraHandle zh, ZebraSet s, int reg_type,
@@
-307,7
+308,8
@@
ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet, RSET rset,
NMEM nmem);
void resultSetInvalidate(ZebraHandle zh);
NMEM nmem);
void resultSetInvalidate(ZebraHandle zh);
-int zebra_record_fetch(ZebraHandle zh, zint sysno, int score,
+int zebra_record_fetch(ZebraHandle zh, const char *setname,
+ zint sysno, int score,
zebra_snippets *hit_snippet, ODR stream,
const Odr_oid *input_format, Z_RecordComposition *comp,
const Odr_oid **output_format, char **rec_bufp,
zebra_snippets *hit_snippet, ODR stream,
const Odr_oid *input_format, Z_RecordComposition *comp,
const Odr_oid **output_format, char **rec_bufp,
@@
-316,6
+318,13
@@
int zebra_record_fetch(ZebraHandle zh, zint sysno, int score,
void extract_get_fname_tmp(ZebraHandle zh, char *fname, int no);
void extract_get_fname_tmp(ZebraHandle zh, char *fname, int no);
+void extract_snippet(ZebraHandle zh, zebra_snippets *sn,
+ struct ZebraRecStream *stream, RecType rt,
+ void *recTypeClientData);
+
+int zebra_get_rec_snippets(ZebraHandle zh, zint sysno,
+ zebra_snippets *snippets);
+
void zebra_index_merge(ZebraHandle zh);
ZEBRA_RES zebra_buffer_extract_record(ZebraHandle zh,
void zebra_index_merge(ZebraHandle zh);
ZEBRA_RES zebra_buffer_extract_record(ZebraHandle zh,
@@
-377,7
+386,7
@@
void zebra_term_untrans(ZebraHandle zh, int reg_type,
ZEBRA_RES zebra_apt_get_ord(ZebraHandle zh,
Z_AttributesPlusTerm *zapt,
ZEBRA_RES zebra_apt_get_ord(ZebraHandle zh,
Z_AttributesPlusTerm *zapt,
- int index_type,
+ const char *index_type,
const char *xpath_use,
const Odr_oid *curAttributeSet,
int *ord);
const char *xpath_use,
const Odr_oid *curAttributeSet,
int *ord);
@@
-385,7
+394,7
@@
ZEBRA_RES zebra_apt_get_ord(ZebraHandle zh,
ZEBRA_RES zebra_attr_list_get_ord(ZebraHandle zh,
Z_AttributeList *attr_list,
zinfo_index_category_t cat,
ZEBRA_RES zebra_attr_list_get_ord(ZebraHandle zh,
Z_AttributeList *attr_list,
zinfo_index_category_t cat,
- int index_type,
+ const char *index_type,
const Odr_oid *curAttributeSet,
int *ord);
const Odr_oid *curAttributeSet,
int *ord);
@@
-401,11
+410,11
@@
ZEBRA_RES zebra_remove_file_match(ZebraHandle zh);
struct rpn_char_map_info
{
struct rpn_char_map_info
{
- ZebraMaps zm;
+ zebra_map_t zm;
int reg_type;
};
int reg_type;
};
-void rpn_char_map_prepare(struct zebra_register *reg, int reg_type,
+void rpn_char_map_prepare(struct zebra_register *reg, zebra_map_t zm,
struct rpn_char_map_info *map_info);
ZEBRA_RES zapt_term_to_utf8(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
struct rpn_char_map_info *map_info);
ZEBRA_RES zapt_term_to_utf8(ZebraHandle zh, Z_AttributesPlusTerm *zapt,