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

diff --git a/dict/open.c b/dict/open.c
index fda7f4f..e20f2f5 100644
--- a/dict/open.c
+++ b/dict/open.c
@@ -4,12 +4,29 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: open.c,v $
- * Revision 1.1  1994-08-16 16:26:49  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.
+ *
+ * Revision 1.3  1994/08/18  12:40:58  adam
+ * Some development of dictionary. Not finished at all!
+ *
+ * Revision 1.2  1994/08/17  13:32:20  adam
+ * Use cache in dict - not in bfile.
+ *
+ * Revision 1.1  1994/08/16  16:26:49  adam
  * Added dict.
  *
  */
 
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -21,49 +38,63 @@ 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));
 
-    if (rw)
-        dict->bf = bf_open_w (name, DICT_PAGESIZE, cache);
-    else
-        dict->bf = bf_open (name, DICT_PAGESIZE, cache);
+    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->bf)
+    if(!dict->dbf)
     {
-        free (dict);
+        logf (LOG_WARN, "Cannot open `%s'", name);
+        xfree (dict);
         return NULL;
     }
-    if (bf_read (dict->bf, 0, &head_buf) <= 0)
+    if (dict_bf_readp (dict->dbf, 0, &head_buf) <= 0)
     {
         if (rw) 
         {   /* create header with information (page 0) */
-            bf_newp (dict->bf, 0, &head_buf);
+            dict_bf_newp (dict->dbf, 0, &head_buf);
             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 */
     {
         dh = (struct Dict_head *) head_buf;
-        if (!strcmp (dh->magic_str, DICT_MAGIC))
+        if (strcmp (dh->magic_str, DICT_MAGIC))
         {
-            bf_close (dict->bf);
-            free (dict);
+            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)
         {
-            bf_close (dict->bf);
-            free (dict);
+            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;
         }
         memcpy (&dict->head, dh, sizeof(*dh));
@@ -78,5 +109,5 @@ int dict_strcmp (const Dict_char *s1, const Dict_char *s2)
 
 int dict_strlen (const Dict_char *s)
 {
-    return strlen(s)+1;
+    return strlen(s);
 }