X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Fopen.c;h=95c86ca20de6824be794f8a64694ea97f51c76af;hb=65615b66e805376b23f24a51e7d048f4f58e6525;hp=6ead6072fa7938056b397c2a7921cd0459594e24;hpb=2f0932393fb205b2e9b941db50cf5aebfba5c385;p=idzebra-moved-to-github.git

diff --git a/dict/open.c b/dict/open.c
index 6ead607..95c86ca 100644
--- a/dict/open.c
+++ b/dict/open.c
@@ -4,7 +4,23 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: open.c,v $
- * Revision 1.3  1994-08-18 12:40:58  adam
+ * Revision 1.8  1995-12-07 11:48:56  adam
+ * Insert operation obeys DICT_type = 1 (slack in page).
+ * Function dict_open exists if page size or magic aren't right.
+ *
+ * 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
@@ -26,13 +42,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 < 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->rw = rw;
 
     if(!dict->dbf)
     {
+        logf (LOG_WARN, "Cannot open `%s'", name);
         xfree (dict);
         return NULL;
     }
@@ -44,29 +74,28 @@ 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 */
     {
         dh = (struct Dict_head *) head_buf;
-        if (!strcmp (dh->magic_str, DICT_MAGIC))
+        if (strcmp (dh->magic_str, DICT_MAGIC))
         {
-            dict_bf_close (dict->dbf);
-            xfree (dict);
-            return NULL;
+            logf (LOG_WARN, "Bad magic of `%s'", name);
+            exit (1);
         }
-        if (dh->page_size != DICT_PAGESIZE)
+        if (dh->page_size != page_size)
         {
-            dict_bf_close (dict->dbf);
-            xfree (dict);
-            return NULL;
+            logf (LOG_WARN, "Resource %s is %d and pagesize of `%s' is %d",
+                  resource_str, page_size, name, dh->page_size);
+            exit (1);
         }
         memcpy (&dict->head, dh, sizeof(*dh));
     }
@@ -80,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);
 }