X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Flookup.c;h=f08de3cdd656206f09fb74597bc2f0f4c742ac32;hb=83533000f9456dcab2fc171abafd84d6104d4087;hp=46a13c4c40b21b9ebab17e8b87831861a80022f9;hpb=65752ce7054586c724bd1e972a290594eeae85d0;p=idzebra-moved-to-github.git diff --git a/dict/lookup.c b/dict/lookup.c index 46a13c4..f08de3c 100644 --- a/dict/lookup.c +++ b/dict/lookup.c @@ -1,10 +1,23 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: lookup.c,v $ - * Revision 1.6 1995-12-11 09:04:50 adam + * Revision 1.10 1999-05-15 14:36:37 adam + * Updated dictionary. Implemented "compression" of dictionary. + * + * Revision 1.9 1999/02/02 14:50:25 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.8 1998/03/05 08:17:24 adam + * Added a few comments - no code changed. + * + * 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 @@ -31,9 +44,8 @@ #include -static char *dict_look (Dict dict, const Dict_char *str) +static char *dict_look (Dict dict, const Dict_char *str, Dict_ptr ptr) { - Dict_ptr ptr = 1; int mid, lo, hi; int cmp; void *p; @@ -43,7 +55,7 @@ static char *dict_look (Dict dict, const Dict_char *str) dict_bf_readp (dict->dbf, ptr, &p); mid = lo = 0; hi = DICT_nodir(p)-1; - indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short)); + indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short)); while (lo <= hi) { mid = (lo+hi)/2; @@ -55,7 +67,8 @@ static char *dict_look (Dict dict, const 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 { @@ -86,8 +99,7 @@ static char *dict_look (Dict dict, const Dict_char *str) dict_bf_readp (dict->dbf, ptr, &p); mid = lo = 0; hi = DICT_nodir(p)-1; - indxp = (short*) ((char*) p+DICT_pagesize(dict) - -sizeof(short)); + indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short)); continue; } } @@ -100,11 +112,9 @@ static char *dict_look (Dict dict, const Dict_char *str) return NULL; } -char *dict_lookup (Dict dict, const Dict_char *p) +char *dict_lookup (Dict dict, const char *p) { - if (dict->head.last <= 1) + if (!dict->head.root) return NULL; - return dict_look (dict, p); + return dict_look (dict, (const Dict_char *) p, dict->head.root); } - -