X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fisam.h;h=0e4488a2bb38e85e1f355704984391f8dd697f13;hb=79176bd8a477e1c64ac3ec03b50405ed5ed85a3f;hp=dd70f69be0d8234de131e6c33967264f7a82d50f;hpb=c6c40893444f2288cdea91d30dd92df0f285e67d;p=idzebra-moved-to-github.git

diff --git a/include/isam.h b/include/isam.h
index dd70f69..0e4488a 100644
--- a/include/isam.h
+++ b/include/isam.h
@@ -1,33 +1,44 @@
-/*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: isam.h,v $
- * Revision 1.3  1994-09-26 16:08:42  quinn
- * Most of the functionality in place.
- *
- * Revision 1.2  1994/09/14  13:10:35  quinn
- * Small changes
- *
- * Revision 1.1  1994/09/12  08:02:07  quinn
- * Not functional yet
- *
- */
+/* $Id: isam.h,v 1.15 2002-08-02 19:26:55 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   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 ISAM_H
 #define ISAM_H
 
+#include <res.h>
 #include <bfile.h>
-#include <isam.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 */
-typedef unsigned int ISAM_P;
-
 /*
  * Description of a blocktype (part of an isam file)
  */
@@ -40,7 +51,7 @@ typedef struct isam_blocktype
     int max_keys_block0;         /* max num of keys in first block */
     int nice_keys_block;         /* nice number of keys per block */
     int max_keys;                /* max number of keys per table */
-    int freelist;                /* fist free block */
+    int freelist;                /* first free block */
     int top;                     /* first unused block */
     int index;                   /* placeholder. Always 0. */
     char *dbuf;                  /* buffer for use in I/O operations */
@@ -57,13 +68,11 @@ typedef struct isam_struct
     int keysize;                  /* size of the keys (records) used */
     int repack;                   /* how many percent to grow before repack */
     int (*cmp)(const void *k1, const void *k2); /* compare function */
-} isam_struct, *ISAM;
+} isam_struct;
 
 typedef struct ispt_struct
 {
-    ISAM is;                       /* which file do we belong to? */
-    int ptr;                       /* current key offset */
-
+    struct is_mtable tab;
     struct ispt_struct *next;      /* freelist */
 } ispt_struct, *ISPT; 
 
@@ -80,7 +89,9 @@ typedef struct ispt_struct
 /*
  * Open isam file.
  */
-ISAM is_open(const char *name, 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.
@@ -105,6 +116,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