X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=f544d8b470ee13750588db795b3e2173c7586229;hb=38bd819ed5b2c30a9bc302412d04f9cb8d345f02;hp=b1f5c48f808fa6234a5662521dd95c08bd8e42f5;hpb=3d3d0cebd23fa527a7e9d5d728e3c744acb37580;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index b1f5c48..f544d8b 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.150 2005-09-13 11:51:06 adam Exp $
+/* $Id: index.h,v 1.155 2006-02-20 18:39:43 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -175,6 +175,7 @@ struct encode_info {
     int prevcmd;
     int keylen; /* tells if we have an unwritten key in buf, and how long*/
     void *encode_handle;
+    void *decode_handle;
     char buf[ENCODE_BUFLEN];
 };
 
@@ -192,12 +193,7 @@ typedef struct zebra_rank_class {
     struct zebra_rank_class *next;
 } *ZebraRankClass;
 
-struct recKeys {
-    int buf_used;
-    int buf_max;
-    char *buf;
-    void *codec_handle;
-};
+#include "reckeys.h"
 
 #if NATTR
 
@@ -234,9 +230,10 @@ struct zebra_register {
     int stop_flag;
     int active; /* 0=shutdown, 1=enabled and inactive, 2=activated */
 
-    struct recKeys keys;
+    zebra_rec_keys_t keys;
+
 #if NATTR
-    struct recKeys sortKeys;
+    zebra_rec_keys_t sortKeys;
 #else
     struct sortKeys sortKeys;
 #endif
@@ -254,6 +251,7 @@ struct zebra_service {
     struct zebra_register *regs;
     Zebra_mutex_cond session_lock;
     Passwd_db passwd_db;
+    Res dbaccess;
     const char *path_root;
     RecTypeClass record_classes;
     NMEM nmem;
@@ -284,6 +282,7 @@ struct zebra_session {
     Res res;
     Res session_res;
     char *user_perm;
+    char *dbaccesslist;
     int errCode;
     zint hits;
     char *errString;
@@ -474,18 +473,19 @@ off_t zebra_record_int_tell (void *fh);
 int zebra_record_int_read (void *fh, char *buf, size_t count);
 void zebra_record_int_end (void *fh, off_t offset);
 
-void print_rec_keys(ZebraHandle zh, struct recKeys *reckeys);
-ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, struct recKeys *reckeys,
+void print_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys);
+
+ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys,
 				  zebra_snippets *snippets);
 ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname,
 				    zint sysno, zebra_snippets *snippets);
 
 void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
-                              int cmd, struct recKeys *reckeys,
+                              int cmd, zebra_rec_keys_t reckeys,
 			      zint staticrank);
 #if NATTR
 void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
-                            int cmd, struct recKeys *skp);
+                            int cmd, zebra_rec_keys_t skp);
 #else
 void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
                             int cmd, struct sortKeys *skp);
@@ -522,6 +522,9 @@ void zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream, int reg_type,
 
 ZEBRA_RES zebra_get_hit_vector(ZebraHandle zh, const char *setname, zint sysno);
 
+void zebra_term_untrans(ZebraHandle zh, int reg_type,
+			char *dst, const char *src);
+
 YAZ_END_CDECL
 
 #endif