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

diff --git a/dict/open.c b/dict/open.c
index 6b2679a..a38076b 100644
--- a/dict/open.c
+++ b/dict/open.c
@@ -1,12 +1,44 @@
 /*
- * 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.4  1994-09-01 17:44:10  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
+ * The public functions simply use char instead of Dict_char to represent
+ * search strings. Dict_char is used internally only.
+ *
+ * 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.
- * CVS ----------------------------------------------------------------------
  *
  * Revision 1.3  1994/08/18  12:40:58  adam
  * Some development of dictionary. Not finished at all!
@@ -25,20 +57,34 @@
 
 #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;
     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);
+    if (cache < 5)
+	cache = 5;
+    sprintf (resource_str, "dict.%s.pagesize", name);
+
+    dict->grep_cmap = NULL;
+    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 (bfs, 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 +96,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,17 +110,14 @@ 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);
-            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)
         {
-            log (LOG_LOG, "page size mismatch of `%s'", name);
-            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));
     }
@@ -83,10 +126,10 @@ Dict dict_open (const char *name, int cache, int rw)
 
 int dict_strcmp (const Dict_char *s1, const Dict_char *s2)
 {
-    return strcmp (s1, s2);
+    return strcmp ((const char *) s1, (const char *) s2);
 }
 
 int dict_strlen (const Dict_char *s)
 {
-    return strlen(s);
+    return strlen((const char *) s);
 }