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
Forgot to commit the new rset.h when removing rewind ops
[idzebra-moved-to-github.git]
/
index
/
index.h
diff --git
a/index/index.h
b/index/index.h
index
5d9bcfa
..
0e873de
100644
(file)
--- a/
index/index.h
+++ b/
index/index.h
@@
-1,4
+1,4
@@
-/* $Id: index.h,v 1.110 2004-08-04 08:35:23 adam Exp $
+/* $Id: index.h,v 1.123 2004-09-28 12:39:55 adam 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,9
+24,8
@@
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 <zebrautl.h>
-#include <zebramap.h>
#include <sortidx.h>
#if HAVE_SYS_TIMES_H
#include <sortidx.h>
#if HAVE_SYS_TIMES_H
@@
-36,42
+35,29
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <dict.h>
#include <isams.h>
#include <dict.h>
#include <isams.h>
-#include <isam.h>
#include <isamc.h>
#include <isamb.h>
#include <isamc.h>
#include <isamb.h>
-#define ISAM_DEFAULT "c"
-#include <data1.h>
-#include <recctrl.h>
+#include <d1_absyn.h>
+#include <idzebra/recgrs.h>
#include "recindex.h"
#include "recindex.h"
-#include "zebraapi.h"
+#include <idzebra/api.h>
#include "zinfo.h"
#include <passwddb.h>
#include <rset.h>
YAZ_BEGIN_CDECL
#include "zinfo.h"
#include <passwddb.h>
#include <rset.h>
YAZ_BEGIN_CDECL
+#define ISAM_DEFAULT "b"
+
#define SU_SCHEME 1
#define IT_MAX_WORD 256
#define SU_SCHEME 1
#define IT_MAX_WORD 256
-#define IT_KEY_NEW 1
-
-#if IT_KEY_NEW
-
-#endif
-
-#if IT_KEY_NEW
#define IT_KEY_LEVEL_MAX 4
struct it_key {
int len;
zint mem[IT_KEY_LEVEL_MAX];
};
#define IT_KEY_LEVEL_MAX 4
struct it_key {
int len;
zint mem[IT_KEY_LEVEL_MAX];
};
-#else
-struct it_key {
- int sysno;
- int seqno;
-};
-#endif
enum dirsKind { dirs_dir, dirs_file };
enum dirsKind { dirs_dir, dirs_file };
@@
-115,7
+101,7
@@
int key_close (ZebraHandle zh);
int key_compare (const void *p1, const void *p2);
void key_init(struct it_key *k);
char *key_print_it (const void *p, char *buf);
int key_compare (const void *p1, const void *p2);
void key_init(struct it_key *k);
char *key_print_it (const void *p, char *buf);
-int key_get_seq (const void *p);
+zint key_get_seq (const void *p);
int key_compare_it (const void *p1, const void *p2);
int key_qsort_compare (const void *p1, const void *p2);
void key_logdump (int mask, const void *p);
int key_compare_it (const void *p1, const void *p2);
int key_qsort_compare (const void *p1, const void *p2);
void key_logdump (int mask, const void *p);
@@
-187,9
+173,7
@@
struct encode_info {
int prevseq;
int prevcmd;
int keylen; /* tells if we have an unwritten key in buf, and how long*/
int prevseq;
int prevcmd;
int keylen; /* tells if we have an unwritten key in buf, and how long*/
-#if IT_KEY_NEW
void *encode_handle;
void *encode_handle;
-#endif
char buf[ENCODE_BUFLEN];
};
char buf[ENCODE_BUFLEN];
};
@@
-201,7
+185,7
@@
void encode_key_flush (struct encode_info *i, FILE *outf);
typedef struct {
char *term;
char *db;
typedef struct {
char *term;
char *db;
- int sysno;
+ zint sysno;
int score;
} *ZebraPosSet;
int score;
} *ZebraPosSet;
@@
-218,13
+202,7
@@
struct recKeys {
int buf_used;
int buf_max;
char *buf;
int buf_used;
int buf_max;
char *buf;
-#if IT_KEY_NEW
void *codec_handle;
void *codec_handle;
-#else
- int prevSeqNo;
- char prevAttrSet;
- short prevAttrUse;
-#endif
};
struct sortKeys {
};
struct sortKeys {
@@
-237,7
+215,6
@@
struct zebra_register {
char *name;
ISAMS isams;
char *name;
ISAMS isams;
- ISAM isam;
ISAMC isamc;
ISAMB isamb;
Dict dict;
ISAMC isamc;
ISAMB isamb;
Dict dict;
@@
-281,6
+258,8
@@
struct zebra_service {
Zebra_mutex_cond session_lock;
Passwd_db passwd_db;
const char *path_root;
Zebra_mutex_cond session_lock;
Passwd_db passwd_db;
const char *path_root;
+ RecTypeClass record_classes;
+ NMEM nmem;
};
};
@@
-307,7
+286,7
@@
struct zebra_session {
Res res;
char *user_perm;
int errCode;
Res res;
char *user_perm;
int errCode;
- int hits;
+ zint hits;
char *errString;
#if HAVE_SYS_TIMES_H
struct tms tms1;
char *errString;
#if HAVE_SYS_TIMES_H
struct tms tms1;
@@
-315,10
+294,10
@@
struct zebra_session {
#endif
int shadow_enable;
#endif
int shadow_enable;
- int records_inserted;
- int records_updated;
- int records_deleted;
- int records_processed;
+ zint records_inserted;
+ zint records_updated;
+ zint records_deleted;
+ zint records_processed;
char *record_encoding;
yaz_iconv_t iconv_to_utf8;
char *record_encoding;
yaz_iconv_t iconv_to_utf8;
@@
-360,7
+339,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);
@@
-373,7
+352,8
@@
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,
+ const struct key_control *kctrl, int scope);
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,
@@
-497,6
+477,9
@@
void iscz1_stop (void *p);
void iscz1_decode (void *vp, char **dst, const char **src);
void iscz1_encode (void *vp, char **dst, const char **src);
void iscz1_decode (void *vp, char **dst, const char **src);
void iscz1_encode (void *vp, char **dst, const char **src);
+Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw,
+ int compact_flag, Res res);
+
YAZ_END_CDECL
#endif
YAZ_END_CDECL
#endif