X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Flookup.c;h=01f5ac4a5c9d1d3312676409ffe9f4fe935d0189;hb=b7942589b21cca1b6d44c7bf9446dcb6a5942953;hp=3673e24bc8bc882e9557cd61d37209348fba3923;hpb=0035afa7de3e06c18bf2f559649f34913114ab46;p=idzebra-moved-to-github.git

diff --git a/dict/lookup.c b/dict/lookup.c
index 3673e24..01f5ac4 100644
--- a/dict/lookup.c
+++ b/dict/lookup.c
@@ -4,7 +4,23 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lookup.c,v $
- * Revision 1.2  1994-09-16 15:39:14  adam
+ * Revision 1.7  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.6  1995/12/11  09:04:50  adam
+ * Bug fix: the lookup/scan/lookgrep didn't handle empty dictionary.
+ *
+ * Revision 1.5  1995/09/04  09:09:15  adam
+ * String arg in lookup is const.
+ *
+ * Revision 1.4  1994/10/05  12:16:51  adam
+ * Pagesize is a resource now.
+ *
+ * Revision 1.3  1994/09/26  10:17:25  adam
+ * Minor changes.
+ *
+ * Revision 1.2  1994/09/16  15:39:14  adam
  * Initial code of lookup - not tested yet.
  *
  * Revision 1.1  1994/08/16  16:26:48  adam
@@ -19,7 +35,7 @@
 
 #include <dict.h>
 
-static char *dict_look (Dict dict, Dict_char *str)
+static char *dict_look (Dict dict, const Dict_char *str)
 {
     Dict_ptr ptr = 1;
     int mid, lo, hi;
@@ -31,7 +47,7 @@ static char *dict_look (Dict dict, Dict_char *str)
     dict_bf_readp (dict->dbf, ptr, &p);
     mid = lo = 0;
     hi = DICT_nodir(p)-1;
-    indxp = (short*) ((char*) p+DICT_PAGESIZE-sizeof(short));    
+    indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));    
     while (lo <= hi)
     {
         mid = (lo+hi)/2;
@@ -43,7 +59,8 @@ static char *dict_look (Dict dict, Dict_char *str)
             info = (char*)p + indxp[-mid];
             cmp = dict_strcmp((Dict_char*) info, str);
             if (!cmp)
-                return info+(dict_strlen (info)+1)*sizeof(Dict_char);
+                return info+(dict_strlen ((Dict_char*) info)+1)
+                    *sizeof(Dict_char);
         }
         else
         {
@@ -61,7 +78,11 @@ static char *dict_look (Dict dict, Dict_char *str)
             {
                 memcpy (&subptr, info, sizeof(Dict_ptr));
                 if (*++str == DICT_EOS)
-                    return info+sizeof(Dict_ptr)+sizeof(Dict_char);
+                {
+                    if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
+                        return info+sizeof(Dict_ptr)+sizeof(Dict_char);
+                    return NULL;
+                }
                 else
                 {
                     if (subptr == 0)
@@ -70,7 +91,8 @@ static char *dict_look (Dict dict, Dict_char *str)
                     dict_bf_readp (dict->dbf, ptr, &p);
                     mid = lo = 0;
                     hi = DICT_nodir(p)-1;
-                    indxp = (short*) ((char*) p+DICT_PAGESIZE-sizeof(short));
+                    indxp = (short*) ((char*) p+DICT_pagesize(dict)
+                                      -sizeof(short));
                     continue;
                 }
             }
@@ -83,11 +105,11 @@ static char *dict_look (Dict dict, Dict_char *str)
     return NULL;
 }
 
-char *dict_lookup (Dict dict, Dict_char *p)
+char *dict_lookup (Dict dict, const char *p)
 {
-    if (dict->head.last == 1)
+    if (dict->head.last <= 1)
         return NULL;
-    return dict_look (dict, p);
+    return dict_look (dict, (const Dict_char *) p);
 }