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
Reserved element set _sysno_ returns sysno for record
[idzebra-moved-to-github.git]
/
index
/
index.h
diff --git
a/index/index.h
b/index/index.h
index
2af7982
..
8e7b995
100644
(file)
--- a/
index/index.h
+++ b/
index/index.h
@@
-1,6
+1,6
@@
-/* $Id: index.h,v 1.125 2004-11-29 21:45:11 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: index.h,v 1.132 2005-04-13 13:03:47 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-24,8
+24,9
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#define INDEX_H
#include <time.h>
#define INDEX_H
#include <time.h>
+#include <stdlib.h>
#include <idzebra/version.h>
#include <idzebra/version.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
#include <sortidx.h>
#if HAVE_SYS_TIMES_H
#include <sortidx.h>
#if HAVE_SYS_TIMES_H
@@
-33,10
+34,10
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#endif
#include <sys/stat.h>
#endif
#include <sys/stat.h>
-#include <dict.h>
-#include <isams.h>
-#include <isamc.h>
-#include <isamb.h>
+#include <idzebra/dict.h>
+#include <idzebra/isams.h>
+#include <idzebra/isamc.h>
+#include <idzebra/isamb.h>
#include <d1_absyn.h>
#include <idzebra/recgrs.h>
#include "recindex.h"
#include <d1_absyn.h>
#include <idzebra/recgrs.h>
#include "recindex.h"
@@
-182,13
+183,6
@@
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);
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;
- char *db;
- zint sysno;
- int score;
-} *ZebraPosSet;
-
typedef struct zebra_set *ZebraSet;
typedef struct zebra_rank_class {
typedef struct zebra_set *ZebraSet;
typedef struct zebra_rank_class {
@@
-352,7
+346,7
@@
void 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);
int *position, int *num_entries, ZebraScanEntry **list,
int *is_partial, RSET limit_set, int return_zero);
-RSET rset_trunc (ZebraHandle zh, ISAMS_P *isam_p, int no,
+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,
const struct key_control *kctrl, int scope);
const char *term, int length_term, const char *flags,
int preserve_position, int term_type, NMEM rset_nmem,
const struct key_control *kctrl, int scope);
@@
-368,12
+362,6
@@
ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn,
RSET resultSetRef (ZebraHandle zh, const char *resultSetId);
void resultSetDestroy (ZebraHandle zh, int num_names, char **names,
int *statuses);
RSET resultSetRef (ZebraHandle zh, const char *resultSetId);
void resultSetDestroy (ZebraHandle zh, int num_names, char **names,
int *statuses);
-
-
-ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
- int num, int *positions);
-void zebraPosSetDestroy (ZebraHandle zh, ZebraPosSet records, int num);
-
void resultSetSort (ZebraHandle zh, NMEM nmem,
int num_input_setnames, const char **input_setnames,
const char *output_setname,
void resultSetSort (ZebraHandle zh, NMEM nmem,
int num_input_setnames, const char **input_setnames,
const char *output_setname,