X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=345cf4217d9a29353242eabf55dfec944251ca3b;hb=bfc37d7893ea3861cfedbfa02f6210916a956b70;hp=21969e850246c328afb21e147fde7706eba7dd9d;hpb=2b1851bd5565e3d21f9cf9a37661a584c063b75f;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index 21969e8..345cf42 100644
--- a/index/index.h
+++ b/index/index.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2002, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto
- * $Id: index.h,v 1.75 2002-04-04 14:14:13 adam Exp $
+ * $Id: index.h,v 1.77 2002-04-05 08:46:26 adam Exp $
  */
 
 #ifndef INDEX_H
@@ -20,14 +20,10 @@
 
 #include <dict.h>
 #include <isams.h>
-#if ZMBOL
 #include <isam.h>
 #include <isamc.h>
 #include <isamd.h>
 #define ISAM_DEFAULT "c"
-#else
-#define ISAM_DEFAULT "s"
-#endif
 #include <yaz/data1.h>
 #include <recctrl.h>
 #include "recindex.h"
@@ -78,7 +74,7 @@ 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);
 
-struct dir_entry *dir_open (const char *rep);
+struct dir_entry *dir_open (const char *rep, const char *base);
 void dir_sort (struct dir_entry *e);
 void dir_free (struct dir_entry **e_p);
 
@@ -98,10 +94,8 @@ void inv_prstat (ZebraHandle zh);
 void inv_compact (BFiles bfs);
 void key_input (ZebraHandle zh, int nkeys, int cache, Res res);
 ISAMS_M key_isams_m (Res res, ISAMS_M me);
-#if ZMBOL
 ISAMC_M key_isamc_m (Res res, ISAMC_M me);
 ISAMD_M key_isamd_m (Res res, ISAMD_M me);
-#endif
 int merge_sort (char **buf, int from, int to);
 int key_SU_code (int ch, char *out);
 
@@ -205,11 +199,9 @@ struct zebra_register {
     char *name;
     
     ISAMS isams;
-#if ZMBOL
     ISAM isam;
     ISAMC isamc;
     ISAMD isamd;
-#endif
     Dict dict;
     Dict matchDict;
     SortIdx sortIdx;