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
Using proper nmems for more rsets around the system,
[idzebra-moved-to-github.git]
/
index
/
index.h
diff --git
a/index/index.h
b/index/index.h
index
c03c099
..
7359cfc
100644
(file)
--- a/
index/index.h
+++ b/
index/index.h
@@
-1,4
+1,4
@@
-/* $Id: index.h,v 1.113 2004-08-10 08:19:15 heikki Exp $
+/* $Id: index.h,v 1.116 2004-08-31 14:43:41 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-24,7
+24,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#define INDEX_H
#include <time.h>
#define INDEX_H
#include <time.h>
-#include <zebraver.h>
+#include <idzebra/version.h>
#include <zebrautl.h>
#include <zebramap.h>
#include <sortidx.h>
#include <zebrautl.h>
#include <zebramap.h>
#include <sortidx.h>
@@
-41,7
+41,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <data1.h>
#include <recctrl.h>
#include "recindex.h"
#include <data1.h>
#include <recctrl.h>
#include "recindex.h"
-#include "zebraapi.h"
+#include <idzebra/api.h>
#include "zinfo.h"
#include <passwddb.h>
#include <rset.h>
#include "zinfo.h"
#include <passwddb.h>
#include <rset.h>
@@
-73,6
+73,13
@@
struct it_key {
};
#endif
};
#endif
+struct key_info {
+ int keysize;
+ int (*key_compare) (const void *p1, const void *p2);
+ void (*key_logdump_txt) (int logmask, const void *p, const char *txt);
+ /* FIXME - decode and encode, and lots of other stuff */
+};
+
enum dirsKind { dirs_dir, dirs_file };
struct dir_entry {
enum dirsKind { dirs_dir, dirs_file };
struct dir_entry {
@@
-359,7
+366,7
@@
struct term_set_list {
struct term_set_entry *last;
};
struct term_set_entry *last;
};
-RSET rpn_search (ZebraHandle zh, NMEM mem,
+RSET rpn_search (ZebraHandle zh, NMEM mem, NMEM rset_nmem,
Z_RPNQuery *rpn, int num_bases, char **basenames,
const char *setname, ZebraSet sset);
Z_RPNQuery *rpn, int num_bases, char **basenames,
const char *setname, ZebraSet sset);
@@
-372,7
+379,7
@@
void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
RSET rset_trunc (ZebraHandle zh, ISAMS_P *isam_p, int no,
const char *term, int length_term, const char *flags,
RSET rset_trunc (ZebraHandle zh, ISAMS_P *isam_p, int no,
const char *term, int length_term, const char *flags,
- int preserve_position, int term_type);
+ int preserve_position, int term_type, NMEM rset_nmem);
void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type,
const char *db, int set,
void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type,
const char *db, int set,