Work on dict_compact routine.

[idzebra-moved-to-github.git] / dict / open.c

diff --git a/dict/open.c b/dict/open.c
index 39c3a82..a38076b 100644 (file)
--- a/dict/open.c
+++ b/dict/open.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: open.c,v $
- * Revision 1.10  1996-05-24 14:46:04  adam
+ * Revision 1.14  1999-03-09 13:07:06  adam
+ * Work on dict_compact routine.
+ *
+ * Revision 1.13  1999/02/02 14:50:27  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.12  1997/09/17 12:19:07  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * 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
@@ -44,7 +57,7 @@
 
 #include <dict.h>
 
-Dict dict_open (const char *name, int cache, int rw)
+Dict dict_open (BFiles bfs, const char *name, int cache, int rw)
 {
     Dict dict;
     void *head_buf;
@@ -54,18 +67,19 @@ Dict dict_open (const char *name, int cache, int rw)
 
     dict = xmalloc (sizeof(*dict));
 
+    if (cache < 5)
+       cache = 5;
     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",
               resource_str);
         page_size = 2048;
     }
-    dict->dbf = dict_bf_open (name, page_size, cache, rw);
+    dict->dbf = dict_bf_open (bfs, name, page_size, cache, rw);
     dict->rw = rw;
 
     if(!dict->dbf)