X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=include%2Fisamc.h;h=61cc81a2b9e0ffc954d79592b5ce1622fac2b558;hp=f7c248cd7180e4190a446c16aaa1e0e98933da25;hb=3ba097accecfc6ff9b7620d580314a83568c0f27;hpb=896c0427df9d8eff5de6a1735dcd992e067df844

diff --git a/include/isamc.h b/include/isamc.h
index f7c248c..61cc81a 100644
--- a/include/isamc.h
+++ b/include/isamc.h
@@ -1,5 +1,5 @@
-/* $Id: isamc.h,v 1.10 2002-08-02 19:26:55 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: isamc.h,v 1.14 2004-12-08 12:23:09 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -20,19 +20,16 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
 #ifndef ISAMC_H
 #define ISAMC_H
 
-#include <bfile.h>
+#include <isam-codec.h>
+#include <idzebra/bfile.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+YAZ_BEGIN_CDECL
 
 typedef struct ISAMC_s *ISAMC;
-typedef int ISAMC_P;
+typedef zint ISAMC_P;
 typedef struct ISAMC_PP_s *ISAMC_PP;
 
 typedef struct ISAMC_filecat_s {
@@ -46,43 +43,37 @@ typedef struct ISAMC_M_s {
     ISAMC_filecat filecat;
 
     int (*compare_item)(const void *a, const void *b);
+    void (*log_item)(int logmask, const void *p, const char *txt);
 
-#define ISAMC_DECODE 0
-#define ISAMC_ENCODE 1
-    void *(*code_start)(int mode);
-    void (*code_stop)(int mode, void *p);
-    void (*code_item)(int mode, void *p, char **dst, char **src);
-    void (*code_reset)(void *p);
+    ISAM_CODEC codec;
 
     int max_blocks_mem;
     int debug;
-} *ISAMC_M;
+} ISAMC_M;
 
 typedef struct ISAMC_I_s {
     int (*read_item)(void *clientData, char **dst, int *insertMode);
     void *clientData;
-} *ISAMC_I;
+} ISAMC_I;
 
-void isc_getmethod (ISAMC_M m);
+void isc_getmethod (ISAMC_M *m);
 
-ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method);
+ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M *method);
 int isc_close (ISAMC is);
-ISAMC_P isc_merge (ISAMC is, ISAMC_P pos, ISAMC_I data);
+ISAMC_P isc_merge (ISAMC is, ISAMC_P pos, ISAMC_I *data);
 
 ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P pos);
 void isc_pp_close (ISAMC_PP pp);
 int isc_read_item (ISAMC_PP pp, char **dst);
 int isc_pp_read (ISAMC_PP pp, void *buf);
-int isc_pp_num (ISAMC_PP pp);
+zint isc_pp_num (ISAMC_PP pp);
 
-int isc_block_used (ISAMC is, int type);
+zint isc_block_used (ISAMC is, int type);
 int isc_block_size (ISAMC is, int type);
 
 #define isc_type(x) ((x) & 7)
 #define isc_block(x) ((x) >> 3)
 
-#ifdef __cplusplus
-}
-#endif
+YAZ_END_CDECL
 
 #endif