X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fisamd.h;h=158d5534e58e85e42aa39119a0803e2277bdb0ae;hb=b8e1425a7f78791afbf45dc11acd82808e455c65;hp=9dc95fe87f411e6f4521f21bc45941684f332e88;hpb=72ca1631366b5196106ac777e492b6a70c273651;p=idzebra-moved-to-github.git

diff --git a/include/isamd.h b/include/isamd.h
index 9dc95fe..158d553 100644
--- a/include/isamd.h
+++ b/include/isamd.h
@@ -1,10 +1,13 @@
 /*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-2002, Index Data.
  * See the file LICENSE for details.
  *
- * IsamH is a simple ISAM that can only append to the end of the list.
- * It will need a clean-up process occasionally...  Code stolen from
- * isamc...
+ * Isam-D, Heikki's second Isam. 
+ * The first block of an isam entry contains deltas to the
+ * (possibly long) sequence of keys. Thus small changes consist
+ * only of adding deltas to a small list, and affect only one 
+ * block. Occasionally the block gets full, and needs to be 
+ * merged with the rest.
  * 
  * Heikki Levanto
  *
@@ -17,9 +20,7 @@
 
 #include <bfile.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+YAZ_BEGIN_CDECL
 
 typedef struct ISAMD_s *ISAMD;
 typedef int ISAMD_P;
@@ -55,11 +56,19 @@ ISAMD_M isamd_getmethod (ISAMD_M me);
 
 ISAMD isamd_open (BFiles bfs, const char *name, int writeflag, ISAMD_M method);
 int isamd_close (ISAMD is);
-ISAMD_P isamd_append (ISAMD is, ISAMD_P pos, ISAMD_I data);
-  /* corresponds to isc_merge */
+/*ISAMD_P isamd_append (ISAMD is, ISAMD_P pos, ISAMD_I data);*/
+int isamd_append (ISAMD is, char *dictentry, int dictlen, ISAMD_I data);
+
   
   
-ISAMD_PP isamd_pp_open (ISAMD is, ISAMD_P pos);
+/* Shortcut: If the isam is relatively short, we store the */
+/* whole thing in the dictionary, and allocate no blocks at all! */
+#define ISAMD_MAX_DICT_LEN 16
+
+/*ISAMD_PP isamd_pp_open (ISAMD is, const char *dictbuf);*/
+ISAMD_PP isamd_pp_open (ISAMD is, const char *dictbuf, int dictlen);
+ISAMD_PP isamd_pp_create (ISAMD is, int cat);
+
 void isamd_pp_close (ISAMD_PP pp);
 int isamd_read_item (ISAMD_PP pp, char **dst);
 int isamd_read_main_item (ISAMD_PP pp, char **dst);
@@ -77,11 +86,7 @@ int isamd_block_size (ISAMD is, int type);
 void isamd_buildfirstblock(ISAMD_PP pp);
 void isamd_buildlaterblock(ISAMD_PP pp);
 
-
-
-#ifdef __cplusplus
-}
-#endif
+YAZ_END_CDECL
 
 #endif  /* ISAMD_H */