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
No // comments. Header.
[idzebra-moved-to-github.git]
/
index
/
index.h
diff --git
a/index/index.h
b/index/index.h
index
a805d26
..
90cdd02
100644
(file)
--- a/
index/index.h
+++ b/
index/index.h
@@
-1,4
+1,4
@@
-/* $Id: index.h,v 1.85 2002-08-02 19:26:55 adam Exp $
+/* $Id: index.h,v 1.91 2002-11-15 21:26:00 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-34,10
+34,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#if HAVE_SYS_TIMES_H
#include <sys/times.h>
#endif
#if HAVE_SYS_TIMES_H
#include <sys/times.h>
#endif
-
-#if HAVE_ICONV_H
-#include <iconv.h>
-#endif
+#include <sys/stat.h>
#include <dict.h>
#include <isams.h>
#include <dict.h>
#include <isams.h>
@@
-46,7
+43,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <isamd.h>
#include <isamb.h>
#define ISAM_DEFAULT "c"
#include <isamd.h>
#include <isamb.h>
#define ISAM_DEFAULT "c"
-#include <yaz/data1.h>
+#include <data1.h>
#include <recctrl.h>
#include "recindex.h"
#include "zebraapi.h"
#include <recctrl.h>
#include "recindex.h"
#include "zebraapi.h"
@@
-96,7
+93,8
@@
void dirs_add (struct dirs_info *p, const char *src, int sysno, time_t mtime);
void dirs_del (struct dirs_info *p, const char *src);
void dirs_free (struct dirs_info **pp);
void dirs_del (struct dirs_info *p, const char *src);
void dirs_free (struct dirs_info **pp);
-struct dir_entry *dir_open (const char *rep, const char *base);
+struct dir_entry *dir_open (const char *rep, const char *base,
+ int follow_links);
void dir_sort (struct dir_entry *e);
void dir_free (struct dir_entry **e_p);
void dir_sort (struct dir_entry *e);
void dir_free (struct dir_entry **e_p);
@@
-174,16
+172,22
@@
int key_SU_encode (int ch, char *out);
// extern Res common_resource;
// extern Res common_resource;
+#define ENCODE_BUFLEN 768
struct encode_info {
struct encode_info {
- int sysno;
+ int sysno; /* previously written values for delta-compress */
int seqno;
int cmd;
int seqno;
int cmd;
- char buf[768];
+ int prevsys; /* buffer for skipping insert/delete pairs */
+ int prevseq;
+ int prevcmd;
+ int keylen; /* tells if we have an unwritten key in buf, and how long*/
+ char buf[ENCODE_BUFLEN];
};
void encode_key_init (struct encode_info *i);
char *encode_key_int (int d, char *bp);
void encode_key_write (char *k, struct encode_info *i, FILE *outf);
};
void encode_key_init (struct encode_info *i);
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);
typedef struct {
char *term;
typedef struct {
char *term;
@@
-210,6
+214,13
@@
struct recKeys {
int prevSeqNo;
};
int prevSeqNo;
};
+#if 1
+struct sortKeys {
+ int buf_used;
+ int buf_max;
+ char *buf;
+};
+#else
struct sortKey {
char *string;
int length;
struct sortKey {
char *string;
int length;
@@
-217,6
+228,7
@@
struct sortKey {
int attrUse;
struct sortKey *next;
};
int attrUse;
struct sortKey *next;
};
+#endif
struct zebra_register {
char *name;
struct zebra_register {
char *name;
@@
-245,11
+257,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 */
-
-
struct recKeys keys;
struct recKeys keys;
+#if 1
+ struct sortKeys sortKeys;
+#else
struct sortKey *sortKeys;
struct sortKey *sortKeys;
-
+#endif
char **key_buf;
size_t ptr_top;
size_t ptr_i;
char **key_buf;
size_t ptr_top;
size_t ptr_i;
@@
-303,10
+316,9
@@
struct zebra_session {
int records_deleted;
int records_processed;
char *record_encoding;
int records_deleted;
int records_processed;
char *record_encoding;
-#if HAVE_ICONV_H
- iconv_t iconv_to_utf8;
- iconv_t iconv_from_utf8;
-#endif
+
+ yaz_iconv_t iconv_to_utf8;
+ yaz_iconv_t iconv_from_utf8;
};
struct rank_control {
};
struct rank_control {
@@
-399,6
+411,14
@@
int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no);
void zebra_index_merge (ZebraHandle zh);
void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no);
void zebra_index_merge (ZebraHandle zh);
+int bufferExtractRecord (ZebraHandle zh,
+ const char *buf, size_t buf_size,
+ struct recordGroup *rGroup,
+ int delete_flag,
+ int test_mode,
+ int *sysno,
+ const char *match_criteria,
+ const char *fname);
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
const char *buf, size_t buf_size,
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
const char *buf, size_t buf_size,
@@
-406,7
+426,6
@@
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
int test_mode, int *sysno,
int store_keys, int store_data,
const char *match_criteria);
int test_mode, int *sysno,
int store_keys, int store_data,
const char *match_criteria);
-
void extract_flushWriteKeys (ZebraHandle zh);
struct zebra_fetch_control {
void extract_flushWriteKeys (ZebraHandle zh);
struct zebra_fetch_control {
@@
-429,7
+448,7
@@
void zebra_record_int_end (void *fh, off_t offset);
void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
int cmd, struct recKeys *reckeys);
void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
int cmd, struct recKeys *reckeys);
void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
- int cmd, struct sortKey **skp);
+ int cmd, struct sortKeys *skp);
void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid);
void extract_token_add (RecWord *p);
int explain_extract (void *handle, Record rec, data1_node *n);
void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid);
void extract_token_add (RecWord *p);
int explain_extract (void *handle, Record rec, data1_node *n);
@@
-440,6
+459,8
@@
int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
int zebra_begin_read (ZebraHandle zh);
void zebra_end_read (ZebraHandle zh);
int zebra_begin_read (ZebraHandle zh);
void zebra_end_read (ZebraHandle zh);
+int zebra_file_stat (const char *file_name, struct stat *buf,
+ int follow_links);
YAZ_END_CDECL
YAZ_END_CDECL