From c3950f70c647c6726ab2d5d49506f3ff4948888c Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 29 Oct 1996 14:00:00 +0000
Subject: [PATCH] Page size given by DICT_DEFAULT_PAGESIZE in dict.h.

---
 dict/Makefile   |   10 +++++-----
 dict/dictext.c  |    7 +++++--
 dict/dicttest.c |    6 +++++-
 dict/open.c     |    8 +++++---
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/dict/Makefile b/dict/Makefile
index 6fc4679..780e4f8 100644
--- a/dict/Makefile
+++ b/dict/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.22 1996-05-22 08:26:46 adam Exp $
+# $Id: Makefile,v 1.23 1996-10-29 14:00:00 adam Exp $
 
 SHELL=/bin/sh
 RANLIB=ranlib
@@ -22,12 +22,12 @@ all: $(LIB)
 
 alll: $(LIB) $(TPROG1) $(TPROG2)
 
-$(TPROG1): $(TPROG1).o $(LIB) ../lib/bfile.a ../lib/alexutil.a ../lib/dfa.a
+$(TPROG1): $(TPROG1).o $(LIB) ../lib/bfile.a ../lib/zebrautl.a ../lib/dfa.a
 	$(CC) $(CFLAGS) -o $(TPROG1) $(TPROG1).o $(LIB) \
-		../lib/bfile.a ../lib/dfa.a ../lib/alexutil.a $(YAZLIB)
+		../lib/bfile.a ../lib/dfa.a ../lib/zebrautl.a $(YAZLIB)
 
-$(TPROG2): $(TPROG2).o $(LIB) ../lib/alexutil.a
-	$(CC) $(CFLAGS) -o $(TPROG2) $(TPROG2).o ../lib/alexutil.a $(YAZLIB)
+$(TPROG2): $(TPROG2).o $(LIB) ../lib/zebrautl.a
+	$(CC) $(CFLAGS) -o $(TPROG2) $(TPROG2).o ../lib/zebrautl.a $(YAZLIB)
 
 $(LIB): $(PO)
 	rm -f $(LIB)
diff --git a/dict/dictext.c b/dict/dictext.c
index 6f8373d..76ac896 100644
--- a/dict/dictext.c
+++ b/dict/dictext.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dictext.c,v $
- * Revision 1.5  1996-01-31 21:03:59  adam
+ * Revision 1.6  1996-10-29 14:00:02  adam
+ * Page size given by DICT_DEFAULT_PAGESIZE in dict.h.
+ *
+ * Revision 1.5  1996/01/31 21:03:59  adam
  * Extra options.
  *
  * Revision 1.4  1995/09/04  12:33:31  adam
@@ -27,7 +30,7 @@
 #include <assert.h>
 #include <ctype.h>
 
-#include <alexutil.h>
+#include <zebrautl.h>
 
 char *prog;
 
diff --git a/dict/dicttest.c b/dict/dicttest.c
index 849111e..2b0e1ee 100644
--- a/dict/dicttest.c
+++ b/dict/dicttest.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dicttest.c,v $
- * Revision 1.20  1996-03-20 09:35:16  adam
+ * Revision 1.21  1996-10-29 14:00:03  adam
+ * Page size given by DICT_DEFAULT_PAGESIZE in dict.h.
+ *
+ * Revision 1.20  1996/03/20 09:35:16  adam
  * Function dict_lookup_grep got extra parameter, init_pos, which marks
  * from which position in pattern approximate pattern matching should occur.
  *
@@ -81,6 +84,7 @@
 #include <ctype.h>
 
 #include <dict.h>
+#include <zebrautl.h>
 
 char *prog;
 static Dict dict;
diff --git a/dict/open.c b/dict/open.c
index 39c3a82..0ededaa 100644
--- a/dict/open.c
+++ b/dict/open.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: open.c,v $
- * Revision 1.10  1996-05-24 14:46:04  adam
+ * Revision 1.11  1996-10-29 14:00:05  adam
+ * Page size given by DICT_DEFAULT_PAGESIZE in dict.h.
+ *
+ * Revision 1.10  1996/05/24 14:46:04  adam
  * Added dict_grep_cmap function to define user-mapping in grep lookups.
  *
  * Revision 1.9  1996/02/02  13:43:51  adam
@@ -57,8 +60,7 @@ Dict dict_open (const char *name, int cache, int rw)
     sprintf (resource_str, "dict.%s.pagesize", name);
 
     dict->grep_cmap = NULL;
-    page_size = atoi (res_get_def (common_resource, resource_str, 
-                                   DICT_DEFAULT_PAGESIZE));
+    page_size = DICT_DEFAULT_PAGESIZE;
     if (page_size < 2048)
     {
         logf (LOG_WARN, "Resource %s was too small. Set to 2048",
-- 
1.7.10.4