X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=cb934ecdab0d4f7326378c0d6c6d9bbd4d715666;hb=22963c0b23a178529bc71e5879c7e4f9c3c9b7f9;hp=d92e5e514b32273660041e624c1f69cbd02604b4;hpb=56131846f59919027a4d3c59efb485afb6efb0de;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index d92e5e5..cb934ec 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.117 2004-09-01 15:01:32 heikki Exp $
+/* $Id: index.h,v 1.122 2004-09-28 10:15:03 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -38,8 +38,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <isams.h>
 #include <isamc.h>
 #include <isamb.h>
-#include <data1.h>
-#include <recctrl.h>
+#include <d1_absyn.h>
+#include <idzebra/recgrs.h>
 #include "recindex.h"
 #include <idzebra/api.h>
 #include "zinfo.h"
@@ -54,25 +54,11 @@ YAZ_BEGIN_CDECL
 
 #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];
 };
-#else
-struct it_key {
-    int  sysno;
-    int  seqno;
-};
-#endif
-
 
 enum dirsKind { dirs_dir, dirs_file };
 
@@ -188,9 +174,7 @@ struct encode_info {
     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;
-#endif
     char buf[ENCODE_BUFLEN];
 };
 
@@ -219,13 +203,7 @@ struct recKeys {
     int buf_used;
     int buf_max;
     char *buf;
-#if IT_KEY_NEW
     void *codec_handle;
-#else
-    int prevSeqNo;
-    char prevAttrSet;
-    short prevAttrUse;
-#endif
 };
 
 struct sortKeys {
@@ -281,6 +259,8 @@ struct zebra_service {
     Zebra_mutex_cond session_lock;
     Passwd_db passwd_db;
     const char *path_root;
+    RecTypeClass record_classes;
+    NMEM nmem;
 };
 
 
@@ -374,7 +354,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,
                  int preserve_position, int term_type, NMEM rset_nmem,
-                 const struct key_control *kctrl);
+                 const struct key_control *kctrl, int scope);
 
 void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type,
 		       const char *db, int set,
@@ -498,6 +478,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);
 
+Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw,
+		    int compact_flag, Res res);
+
 YAZ_END_CDECL
 
 #endif