X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=index%2Findex.h;h=d32ada48885fdfb228998768a125a72af62cd953;hb=8ee402d79e37344b08c2b54ad45b50e8327a6c03;hp=fb87c353cecbce7777daaed6bf056b52ae7a1f20;hpb=726c42c6ae793b79a5351d2fce805d220d21321e;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index fb87c35..d32ada4 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.119 2004-09-09 10:08:04 heikki Exp $
+/* $Id: index.h,v 1.121 2004-09-27 10:44:49 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -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;
 };