Minor.

[idzebra-moved-to-github.git] / include / isam.h

diff --git a/include/isam.h b/include/isam.h
index 5dcf571..9ecc319 100644 (file)
--- a/include/isam.h
+++ b/include/isam.h
@@ -1,10 +1,36 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: isam.h,v $
- * Revision 1.6  1994-09-28 11:29:28  quinn
+ * Revision 1.14  1999-02-02 14:50:34  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.13  1997/09/17 12:19:09  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.12  1997/09/05 15:30:00  adam
+ * Changed prototype for chr_map_input - added const.
+ * Added support for C++, headers uses extern "C" for public definitions.
+ *
+ * Revision 1.11  1996/10/29 13:43:44  adam
+ * Removed definition of SYSNO.
+ *
+ * Revision 1.10  1995/09/06 16:10:57  adam
+ * More work on boolean sets.
+ *
+ * Revision 1.9  1994/09/28  16:58:26  quinn
+ * Small mod.
+ *
+ * Revision 1.8  1994/09/28  12:56:09  quinn
+ * Added access functions (ISPT)
+ *
+ * Revision 1.7  1994/09/28  11:56:13  quinn
+ * Removed const from input to is_merge
+ *
+ * Revision 1.6  1994/09/28  11:29:28  quinn
  * Added cmp parameter.
  *
  * Revision 1.5  1994/09/27  20:03:36  quinn
@@ -27,17 +53,20 @@
 #ifndef ISAM_H
 #define ISAM_H
 
+#include <res.h>
 #include <bfile.h>
 
 #include "../isam/memory.h"
 #include "../isam/physical.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define IS_MAX_BLOCKTYPES 4
 #define IS_MAX_RECORD 512
 #define IS_DEF_REPACK_PERCENT "30" /* how much relative change before repack */
 
-typedef unsigned int SYSNO; /* should be somewhere else */
-
 /*
  * Description of a blocktype (part of an isam file)
  */
@@ -71,7 +100,7 @@ typedef struct isam_struct
 
 typedef struct ispt_struct
 {
-    struct is_mtable *tab;
+    struct is_mtable tab;
     struct ispt_struct *next;      /* freelist */
 } ispt_struct, *ISPT; 
 
@@ -88,8 +117,9 @@ typedef struct ispt_struct
 /*
  * Open isam file.
  */
-ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2),
-    int writeflag);
+ISAM is_open(BFiles bfs, const char *name,
+            int (*cmp)(const void *p1, const void *p2),
+            int writeflag, int keysize, Res res);
 
 /*
  * Close isam file.
@@ -114,6 +144,14 @@ int is_readkey(ISPT ip, void *buf);
 
 int is_writekey(ISPT ip, const void *buf);
 
-ISAM_P is_merge(ISAM is, ISAM_P pos, int num, const char *data);
+int is_numkeys(ISPT ip);
+
+void is_rewind(ISPT ip);
+
+ISAM_P is_merge(ISAM is, ISAM_P pos, int num, char *data);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif