From 8fa8b7c5d10dd87654e5c219cceebe1a9664544a Mon Sep 17 00:00:00 2001
From: Sebastian Hammer <quinn@indexdata.com>
Date: Mon, 26 Sep 1994 17:06:34 +0000
Subject: [PATCH] Back again...

---
 isam/Makefile   |    4 ++++
 isam/isam.c     |   21 ++++++++++++++++-----
 isam/memory.c   |    7 +++++--
 isam/physical.c |    7 +++++--
 isam/physical.h |    7 ++++++-
 5 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/isam/Makefile b/isam/Makefile
index 7ee1081..dd4180b 100644
--- a/isam/Makefile
+++ b/isam/Makefile
@@ -8,6 +8,10 @@ CPP=cc -E
 
 all: $(LIB)
 
+test: test.c $(LIB)
+	$(CC) -g -o test -I../include test.c \
+	../lib/isam.a ../lib/bfile.a ../lib/util.a
+
 isam-test: isam-test.c $(LIB)
 	$(CC) -g -o isam-test -I../include isam-test.c \
 	../lib/isam.a ../lib/bfile.a ../lib/util.a
diff --git a/isam/isam.c b/isam/isam.c
index ad2f90c..5c847cb 100644
--- a/isam/isam.c
+++ b/isam/isam.c
@@ -4,8 +4,8 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: isam.c,v $
- * Revision 1.2  1994-09-26 16:07:53  quinn
- * Most of the functionality in place.
+ * Revision 1.3  1994-09-26 17:06:35  quinn
+ * Back again...
  *
  * Revision 1.1  1994/09/12  08:02:13  quinn
  * Not functional yet
@@ -17,12 +17,12 @@
 #include <ctype.h>
 
 #include <util.h>
-#include "isutil.h"
-#include "rootblk.h"
 #include <bfile.h>
 #include <isam.h>
 #include <common.h>
-#include "memory.h"
+#include "isutil.h"
+#include "rootblk.h"
+#include <ismemory.h>
 #include "physical.h"
 #include "keyops.h"
 
@@ -345,3 +345,14 @@ ISAM_P is_merge(ISAM is, ISAM_P pos, int num, const char *data)
     is_p_sync(&tab);
     return is_address(tab.pos_type, tab.data->diskpos);
 }
+
+/*
+ * Locate a table of keys in an isam file. The ISPT is an individual
+ * position marker for that table.
+ */
+ISPT is_position(ISAM is, ISAM_P pos);
+
+/*
+ * Release ISPT.
+ */
+void is_pt_free(ISPT ip);
diff --git a/isam/memory.c b/isam/memory.c
index 13be94b..ba39802 100644
--- a/isam/memory.c
+++ b/isam/memory.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: memory.c,v $
- * Revision 1.1  1994-09-26 16:07:56  quinn
+ * Revision 1.2  1994-09-26 17:06:35  quinn
+ * Back again...
+ *
+ * Revision 1.1  1994/09/26  16:07:56  quinn
  * Most of the functionality in place.
  *
  */
@@ -16,7 +19,7 @@
 #include <assert.h>
 
 #include <util.h>
-#include "memory.h"
+#include <ismemory.h>
 #include "physical.h"
 #include <isam.h>
 
diff --git a/isam/physical.c b/isam/physical.c
index d188a2b..3ea43b9 100644
--- a/isam/physical.c
+++ b/isam/physical.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: physical.c,v $
- * Revision 1.1  1994-09-26 16:07:57  quinn
+ * Revision 1.2  1994-09-26 17:06:36  quinn
+ * Back again...
+ *
+ * Revision 1.1  1994/09/26  16:07:57  quinn
  * Most of the functionality in place.
  *
  */
@@ -16,7 +19,7 @@
 #include <assert.h>
 
 #include <isam.h>
-#include "memory.h"
+#include <ismemory.h>
 
 static int is_freestore_alloc(ISAM is, int type)
 {
diff --git a/isam/physical.h b/isam/physical.h
index 5e9cd54..a31fdd0 100644
--- a/isam/physical.h
+++ b/isam/physical.h
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: physical.h,v $
- * Revision 1.1  1994-09-26 16:07:59  quinn
+ * Revision 1.2  1994-09-26 17:06:37  quinn
+ * Back again...
+ *
+ * Revision 1.1  1994/09/26  16:07:59  quinn
  * Most of the functionality in place.
  *
  */
@@ -12,6 +15,8 @@
 #ifndef PHYSICAL_H
 #define PHYSICAL_H
 
+#include <ismemory.h>
+
 void is_p_sync(is_mtable *tab);
 void is_p_unmap(is_mtable *tab);
 void is_p_align(is_mtable *tab);
-- 
1.7.10.4