X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=219ab3820c1996c20afe3926fc1e3dc1df770590;hb=83533000f9456dcab2fc171abafd84d6104d4087;hp=e7c61de7b6e559455621e59d68fab97c4fab8c45;hpb=e8f4cf34c75ffdc7bbfaf3fa232f29cc1384b60c;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index e7c61de..219ab38 100644
--- a/index/index.h
+++ b/index/index.h
@@ -10,12 +10,16 @@
 #include <zebramap.h>
 
 #include <dict.h>
+#include <isams.h>
+#if ZMBOL
 #include <isam.h>
 #include <isamc.h>
-#include <isams.h>
-#include <isamh.h>
 #include <isamd.h>
-#include <data1.h>
+#define ISAM_DEFAULT "c"
+#else
+#define ISAM_DEFAULT "s"
+#endif
+#include <yaz/data1.h>
 #include <recctrl.h>
 
 #ifdef __cplusplus
@@ -100,10 +104,11 @@ void key_logdump (int mask, const void *p);
 void inv_prstat (BFiles bfs);
 void inv_compact (BFiles bfs);
 void key_input (BFiles bfs, int nkeys, int cache);
-ISAMC_M key_isamc_m (Res res, ISAMC_M me);
 ISAMS_M key_isams_m (Res res, ISAMS_M me);
-ISAMH_M key_isamh_m (Res res);
+#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);
 
@@ -132,7 +137,7 @@ int fileExtract (SYSNO *sysno, const char *fname,
 
 void zebraIndexLockMsg (const char *str);
 void zebraIndexUnlock (void);
-void zebraIndexLock (BFiles bfs, int commitNow, const char *rval);
+int zebraIndexLock (BFiles bfs, int commitNow, const char *rval);
 int zebraIndexWait (int commitPhase);
 
 #define FNAME_MAIN_LOCK   "zebraidx.LCK"
@@ -161,7 +166,13 @@ extern Res common_resource;
 
 /*
  * $Log: index.h,v $
- * Revision 1.66  1999-07-14 13:21:34  heikki
+ * Revision 1.68  2000-02-24 11:00:07  adam
+ * Fixed bug: indexer would run forever when lock dir was non-existant.
+ *
+ * Revision 1.67  1999/11/30 13:48:03  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.66  1999/07/14 13:21:34  heikki
  * Added isam-d files. Compiles (almost) clean. Doesn't work at all
  *
  * Revision 1.65  1999/07/14 10:59:26  adam