X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fisamd.h;h=d252a2f21160d145648c26914a82bc2630a27753;hb=05259bf944ff61befc9bee89b7377bf365b25099;hp=da8496bc9ae0256bd00ce82d425265b7f7ad0987;hpb=27babe1d585162b54b750fd5bf6a2139dee42bc1;p=idzebra-moved-to-github.git

diff --git a/include/isamd.h b/include/isamd.h
index da8496b..d252a2f 100644
--- a/include/isamd.h
+++ b/include/isamd.h
@@ -1,25 +1,31 @@
-/*
- * Copyright (c) 1995-1997, 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...
- * 
- * Heikki Levanto
- *
- * Detailed log at the end of the file
- *
- */
+/* $Id$
+   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 ISAMD_H
 #define ISAMD_H
 
 #include <bfile.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+YAZ_BEGIN_CDECL
 
 typedef struct ISAMD_s *ISAMD;
 typedef int ISAMD_P;
@@ -34,6 +40,7 @@ typedef struct ISAMD_M_s {
     ISAMD_filecat filecat;
 
     int (*compare_item)(const void *a, const void *b);
+    void (*log_item)(int logmask, const void *p, const char *txt);
 
 #define ISAMD_DECODE 0
 #define ISAMD_ENCODE 1
@@ -44,22 +51,30 @@ typedef struct ISAMD_M_s {
 
     int max_blocks_mem;
     int debug;
-} *ISAMD_M;
+} ISAMD_M;
 
 typedef struct ISAMD_I_s {  /* encapsulation of input data */
     int (*read_item)(void *clientData, char **dst, int *insertMode);
     void *clientData;
 } *ISAMD_I;
 
-ISAMD_M isamd_getmethod (ISAMD_M me);
+ISAMD_M *isamd_getmethod (ISAMD_M *me);
 
-ISAMD isamd_open (BFiles bfs, const char *name, int writeflag, ISAMD_M method);
+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,15 +92,16 @@ 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 */
 
 
 /*
  * $Log: isamd.h,v $
+ * Revision 1.3  1999/08/18 08:33:41  heikki
+ * Fixes
+ *
  * Revision 1.2  1999/07/14 13:21:34  heikki
  * Added isam-d files. Compiles (almost) clean. Doesn't work at all
  *