X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Flookupec.c;h=94794e1663e634c76016143bdcd7eb7137cd0d60;hp=d34027b239f5503a4985e88015e60798c79ca377;hb=e2e073b5c947e996304ed7d577497af5e9a879ee;hpb=cfecd7d576e8de7cfa19751b8ec7eebf265b2346 diff --git a/dict/lookupec.c b/dict/lookupec.c index d34027b..94794e1 100644 --- a/dict/lookupec.c +++ b/dict/lookupec.c @@ -1,26 +1,31 @@ -/* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: lookupec.c,v $ - * Revision 1.2 1994-09-22 14:43:57 adam - * First functional version of lookup with error correction. A 'range' - * specified the maximum number of insertions+deletions+substitutions. - * - * Revision 1.1 1994/09/22 10:43:44 adam - * Two versions of depend. Type 1 is the tail-type compatible with - * all make programs. Type 2 is the GNU make with include facility. - * Type 2 is default. depend rule chooses current rule. - * - */ +/* This file is part of the Zebra server. + Copyright (C) Index Data + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +#if HAVE_CONFIG_H +#include +#endif #include #include #include #include -#include +#include "dict-p.h" typedef unsigned MatchWord; @@ -31,9 +36,10 @@ typedef struct { #define SH(x) (((x)<<1)+1) -int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base, - int pos, int (*userfunc)(Dict_char *), - int range, Dict_char *prefix) +static int lookup_ec(Dict dict, Dict_ptr ptr, + MatchInfo *mi, MatchWord *ri_base, + int pos, int (*userfunc)(char *), int range, + Dict_char *prefix) { int lo, hi; void *p; @@ -41,10 +47,10 @@ int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base, char *info; MatchWord match_mask = 1<<(mi->m-1); - dict_bf_readp (dict->dbf, ptr, &p); + dict_bf_readp(dict->dbf, ptr, &p); lo = 0; hi = DICT_nodir(p)-1; - indxp = (short*) ((char*) p+DICT_PAGESIZE-sizeof(short)); + indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short)); while (lo <= hi) { if (indxp[-lo] > 0) @@ -59,12 +65,12 @@ int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base, { Dict_char ch; - memcpy (&ch, info+j*sizeof(Dict_char), sizeof(Dict_char)); + memcpy(&ch, info+j*sizeof(Dict_char), sizeof(Dict_char)); prefix[pos+j] = ch; if (ch == DICT_EOS) { if (ri[range] & match_mask) - (*userfunc)(prefix); + (*userfunc)((char*) prefix); break; } if (j+pos >= mi->m+range) @@ -90,9 +96,9 @@ int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base, /* unsigned char length of information */ /* char * information */ info = (char*)p - indxp[-lo]; - memcpy (&ch, info+sizeof(Dict_ptr), sizeof(Dict_char)); + memcpy(&ch, info+sizeof(Dict_ptr), sizeof(Dict_char)); prefix[pos] = ch; - + sc = mi->s[ch & 255]; ri[1+range] = SH(ri[0]) & sc; for (i=1; i<=range; i++) @@ -106,15 +112,16 @@ int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base, (ri[range] & match_mask)) { prefix[pos+1] = DICT_EOS; - (*userfunc)(prefix); + (*userfunc)((char*) prefix); } - memcpy (&subptr, info, sizeof(Dict_ptr)); + memcpy(&subptr, info, sizeof(Dict_ptr)); if (subptr) { - dict_look_ec (dict, subptr, mi, ri, pos+1, - userfunc, range, prefix); - dict_bf_readp (dict->dbf, ptr, &p); - indxp = (short*) ((char*) p+DICT_PAGESIZE-sizeof(short)); + lookup_ec(dict, subptr, mi, ri, pos+1, + userfunc, range, prefix); + dict_bf_readp(dict->dbf, ptr, &p); + indxp = (short*) ((char*) p + + DICT_bsize(p)-sizeof(short)); } } } @@ -123,49 +130,52 @@ int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base, return 0; } -static MatchInfo *prepare_match (Dict_char *pattern) +static MatchInfo *prepare_match(Dict_char *pattern) { int i; MatchWord *s; MatchInfo *mi; - mi = xmalloc (sizeof(*mi)); - mi->m = dict_strlen (pattern); - mi->s = s = xmalloc (sizeof(*s)*256); /* 256 !!! */ - for (i=0; i<256; i++) + mi = (MatchInfo *) xmalloc(sizeof(*mi)); + mi->m = dict_strlen(pattern); + mi->s = s = (MatchWord *) xmalloc(sizeof(*s)*256); /* 256 !!! */ + for (i = 0; i < 256; i++) s[i] = 0; - for (i=0; pattern[i]; i++) + for (i = 0; pattern[i]; i++) s[pattern[i]&255] += 1<head.last == 1) + if (!dict->head.root) return 0; - - mi = prepare_match (pattern); -#if 1 - ri = xmalloc ((dict_strlen(pattern)+range+2)*(range+1)*sizeof(*ri)); -#else - ri = xmalloc (2048 * (range+1) * sizeof(*ri)); -#endif + mi = prepare_match((Dict_char*) pattern); - for (i=0; i<=range; i++) + ri = (MatchWord *) xmalloc((dict_strlen((Dict_char*) pattern)+range+2) + * (range+1)*sizeof(*ri)); + for (i = 0; i <= range; i++) ri[i] = (2<head.root, mi, ri, 0, userfunc, + range, prefix); + xfree(ri); + return ret; +} +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */