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

diff --git a/include/isamc.h b/include/isamc.h
index 6b80198..61cc81a 100644
--- a/include/isamc.h
+++ b/include/isamc.h
@@ -1,54 +1,35 @@
-/*
- * Copyright (c) 1995-1997, Index Data.
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: isamc.h,v $
- * Revision 1.9  1999-07-14 10:59:26  adam
- * Changed functions isc_getmethod, isams_getmethod.
- * Improved fatal error handling (such as missing EXPLAIN schema).
- *
- * Revision 1.8  1999/06/30 09:08:23  adam
- * Added coder to reset.
- *
- * Revision 1.7  1998/03/13 15:30:50  adam
- * New functions isc_block_used and isc_block_size. Fixed 'leak'
- * in isc_alloc_block.
- *
- * Revision 1.6  1997/09/17 12:19:10  adam
- * Zebra version corresponds to YAZ version 1.4.
- * Changed Zebra server so that it doesn't depend on global common_resource.
- *
- * Revision 1.5  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.4  1996/11/08 11:08:01  adam
- * New internal release.
- *
- * Revision 1.3  1996/11/01 13:35:03  adam
- * New element, max_blocks_mem, that control how many blocks of max size
- * to store in memory during isc_merge.
- *
- * Revision 1.2  1996/10/29  16:44:42  adam
- * Added isc_type, isc_block macros.
- *
- * Revision 1.1  1996/10/29  13:40:37  adam
- * First work.
- *
- */
+/* $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.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+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 {
@@ -62,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