X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Fopen.c;h=e20f2f56d70d85e50208704ba5797ee1870575c7;hb=400055a9f298ff9d5689dcf292c84f8cafff4697;hp=6b2679a437300f1a45242c0cf91129865886b981;hpb=f9c29149e90d3710b0d6f2d6a7a4cffcba401fe6;p=idzebra-moved-to-github.git

diff --git a/dict/open.c b/dict/open.c
index 6b2679a..e20f2f5 100644
--- a/dict/open.c
+++ b/dict/open.c
@@ -4,9 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: open.c,v $
- * Revision 1.4  1994-09-01 17:44:10  adam
+ * Revision 1.7  1995-09-04 12:33:32  adam
+ * Various cleanup. YAZ util used instead.
+ *
+ * Revision 1.6  1994/10/05  12:16:52  adam
+ * Pagesize is a resource now.
+ *
+ * Revision 1.5  1994/09/01  17:49:39  adam
+ * Removed stupid line. Work on insertion in dictionary. Not finished yet.
+ *
+ * Revision 1.4  1994/09/01  17:44:10  adam
  * depend include change.
- * CVS ----------------------------------------------------------------------
  *
  * Revision 1.3  1994/08/18  12:40:58  adam
  * Some development of dictionary. Not finished at all!
@@ -30,15 +38,27 @@ Dict dict_open (const char *name, int cache, int rw)
     Dict dict;
     void *head_buf;
     struct Dict_head *dh;
+    char resource_str[80];
+    int page_size;
 
     dict = xmalloc (sizeof(*dict));
 
-    dict->dbf = dict_bf_open (name, DICT_PAGESIZE, cache, rw);
+    sprintf (resource_str, "dict.%s.pagesize", name);
+
+    page_size = atoi (res_get_def (common_resource, resource_str, 
+                                   DICT_DEFAULT_PAGESIZE));
+    if (page_size < 1024)
+    {
+        logf (LOG_WARN, "Resource %s was too small. Set to 1024",
+              resource_str);
+        page_size = 1024;
+    }
+    dict->dbf = dict_bf_open (name, page_size, cache, rw);
     dict->rw = rw;
 
     if(!dict->dbf)
     {
-        log (LOG_LOG, "cannot open `%s'", name);
+        logf (LOG_WARN, "Cannot open `%s'", name);
         xfree (dict);
         return NULL;
     }
@@ -50,13 +70,13 @@ Dict dict_open (const char *name, int cache, int rw)
             dh = (struct Dict_head *) head_buf;
             strcpy(dh->magic_str, DICT_MAGIC);
             dh->free_list = dh->last = 1;
-            dh->page_size = DICT_PAGESIZE;
+            dh->page_size = page_size;
             memcpy (&dict->head, dh, sizeof(*dh));
         }
         else
         {   /* no header present, i.e. no dictionary at all */
             dict->head.free_list = dict->head.last = 0;
-            dict->head.page_size = DICT_PAGESIZE;
+            dict->head.page_size = page_size;
         }
     }
     else /* header was there, check magic and page size */
@@ -64,14 +84,15 @@ Dict dict_open (const char *name, int cache, int rw)
         dh = (struct Dict_head *) head_buf;
         if (strcmp (dh->magic_str, DICT_MAGIC))
         {
-            log (LOG_LOG, "bad magic of `%s'", name);
+            logf (LOG_WARN, "Bad magic of `%s'", name);
             dict_bf_close (dict->dbf);
             xfree (dict);
             return NULL;
         }
-        if (dh->page_size != DICT_PAGESIZE)
+        if (dh->page_size != page_size)
         {
-            log (LOG_LOG, "page size mismatch of `%s'", name);
+            logf (LOG_WARN, "Resource %s is %d and pagesize of `%s' is %d",
+                  resource_str, page_size, name, dh->page_size);
             dict_bf_close (dict->dbf);
             xfree (dict);
             return NULL;