X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Fopen.c;h=02b73fef73f86452b4d976ff6376e7c74668035d;hb=bbc5017bf20ab7e410b4913acd70816812b5059f;hp=95c86ca20de6824be794f8a64694ea97f51c76af;hpb=1209da2618a90d6a811311becdbe2126ffdaa0de;p=idzebra-moved-to-github.git

diff --git a/dict/open.c b/dict/open.c
index 95c86ca..02b73fe 100644
--- a/dict/open.c
+++ b/dict/open.c
@@ -4,7 +4,21 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: open.c,v $
- * Revision 1.8  1995-12-07 11:48:56  adam
+ * 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.
  *
@@ -37,7 +51,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;
@@ -49,15 +63,15 @@ Dict dict_open (const char *name, int cache, int rw)
 
     sprintf (resource_str, "dict.%s.pagesize", name);
 
-    page_size = atoi (res_get_def (common_resource, resource_str, 
-                                   DICT_DEFAULT_PAGESIZE));
+    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 (name, page_size, cache, rw);
+    dict->dbf = dict_bf_open (bfs, name, page_size, cache, rw);
     dict->rw = rw;
 
     if(!dict->dbf)
@@ -104,10 +118,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);
 }