X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Flookupec.c;h=7e9ef54c10d8b652b9a216b6d23b75426c0dacb1;hp=56e53848c37a4d7150c8b01378cab31f78565383;hb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;hpb=02ac0a77d27046442a63371dbf37ee5c0c452dee diff --git a/dict/lookupec.c b/dict/lookupec.c index 56e5384..7e9ef54 100644 --- a/dict/lookupec.c +++ b/dict/lookupec.c @@ -1,22 +1,32 @@ -/* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: lookupec.c,v $ - * 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. - * - */ +/* $Id: lookupec.c,v 1.12 2005-01-15 19:38:23 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS + +This file is part of the Zebra server. + +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 Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + #include #include #include #include -#include +#include "dict-p.h" typedef unsigned MatchWord; @@ -27,87 +37,94 @@ typedef struct { #define SH(x) (((x)<<1)+1) -int dict_look_ec (Dict dict, MatchInfo *mi, MatchWord *ri_base, int pos, - int (*userfunc)(Dict_char *), int range) +int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base, + int pos, int (*userfunc)(char *), int range, + Dict_char *prefix) { - Dict_ptr ptr = 1; - int mid, lo, hi; + int lo, hi; void *p; short *indxp; char *info; MatchWord match_mask = 1<<(mi->m-1); dict_bf_readp (dict->dbf, ptr, &p); - mid = lo = 0; + 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) { - mid = lo; - if (indxp[-mid] > 0) + if (indxp[-lo] > 0) { /* string (Dict_char *) DICT_EOS terminated */ /* unsigned char length of information */ /* char * information */ MatchWord *ri = ri_base, sc; int i, j; - info = (char*)p + indxp[-mid]; + info = (char*)p + indxp[-lo]; for (j=0; ; j++) { Dict_char ch; memcpy (&ch, info+j*sizeof(Dict_char), sizeof(Dict_char)); - if (j && (ri[-1] & match_mask)) + prefix[pos+j] = ch; + if (ch == DICT_EOS) { - if (ch == DICT_EOS) - (*userfunc)(info); + if (ri[range] & match_mask) + (*userfunc)((char*) prefix); break; } - if (j > mi->m+range-pos) - break; - if (ch == DICT_EOS) + if (j+pos >= mi->m+range) break; sc = mi->s[ch & 255]; ri[1+range] = SH(ri[0]) & sc; for (i=1; i<=range; i++) - ri[i+1+range] = (SH(ri[i])&sc) | SH(ri[i-1]) + ri[i+1+range] = (SH(ri[i]) & sc) | SH(ri[i-1]) | SH(ri[i+range]) | ri[i-1]; ri += 1+range; + if (!(ri[range] & (1<<(pos+j)))) + break; } } -#if 0 else { - Dict_char dc; - Dict_ptr subptr; + Dict_char ch; + MatchWord *ri = ri_base, sc; + int i; /* Dict_ptr subptr */ /* Dict_char sub char */ /* unsigned char length of information */ /* char * information */ - info = (char*)p - indxp[-mid]; - memcpy (&dc, info+sizeof(Dict_ptr), sizeof(Dict_char)); - cmp = dc- *str; - if (!cmp) + info = (char*)p - indxp[-lo]; + 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++) + ri[i+1+range] = (SH(ri[i]) & sc) | SH(ri[i-1]) + | SH(ri[i+range]) | ri[i-1]; + ri += 1+range; + if (ri[range] & (1<dbf, ptr, &p); - mid = lo = 0; - hi = DICT_nodir(p)-1; - indxp = (short*) ((char*) p+DICT_PAGESIZE-sizeof(short)); - continue; + indxp = (short*) ((char*) p + + DICT_bsize(p)-sizeof(short)); } } - } -#endif lo++; } return 0; @@ -119,9 +136,9 @@ static MatchInfo *prepare_match (Dict_char *pattern) MatchWord *s; MatchInfo *mi; - mi = xmalloc (sizeof(*mi)); + mi = (MatchInfo *) xmalloc (sizeof(*mi)); mi->m = dict_strlen (pattern); - mi->s = s = xmalloc (sizeof(*s)*256); /* 256 !!! */ + mi->s = s = (MatchWord *) xmalloc (sizeof(*s)*256); /* 256 !!! */ for (i=0; i<256; i++) s[i] = 0; for (i=0; pattern[i]; i++) @@ -129,26 +146,27 @@ static MatchInfo *prepare_match (Dict_char *pattern) return mi; } -int dict_lookup_ec (Dict dict, Dict_char *pattern, int range, - int (*userfunc)(Dict_char *name)) +int dict_lookup_ec (Dict dict, char *pattern, int range, + int (*userfunc)(char *name)) { MatchInfo *mi; MatchWord *ri; int i; + Dict_char prefix[2048]; - if (dict->head.last == 1) + if (!dict->head.root) return 0; - mi = prepare_match (pattern); - ri = xmalloc ((dict_strlen(pattern)+range+2)*(range+1)*sizeof(*ri)); + mi = prepare_match ((Dict_char*) pattern); + + 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 i; } - - -