/*
- * Copyright (C) 1994, Index Data I/S
+ * Copyright (C) 1994-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: lookupec.c,v $
- * Revision 1.3 1994-09-26 16:31:06 adam
+ * Revision 1.9 1999-05-26 07:49:13 adam
+ * C++ compilation.
+ *
+ * Revision 1.8 1999/05/15 14:36:37 adam
+ * Updated dictionary. Implemented "compression" of dictionary.
+ *
+ * Revision 1.7 1999/02/02 14:50:26 adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.6 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.5 1995/01/24 16:01:03 adam
+ * Added -ansi to CFLAGS.
+ * Use new API of dfa module.
+ *
+ * Revision 1.4 1994/10/05 12:16:51 adam
+ * Pagesize is a resource now.
+ *
+ * Revision 1.3 1994/09/26 16:31:06 adam
* Minor changes.
*
* Revision 1.2 1994/09/22 14:43:57 adam
#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)
+ int pos, int (*userfunc)(char *), int range,
+ Dict_char *prefix)
{
int lo, hi;
void *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)
if (ch == DICT_EOS)
{
if (ri[range] & match_mask)
- (*userfunc)(prefix);
+ (*userfunc)((char*) prefix);
break;
}
if (j+pos >= mi->m+range)
(ri[range] & match_mask))
{
prefix[pos+1] = DICT_EOS;
- (*userfunc)(prefix);
+ (*userfunc)((char*) prefix);
}
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));
+ indxp = (short*) ((char*) p +
+ DICT_bsize(p)-sizeof(short));
}
}
}
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++)
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);
-
-#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);
+ ri = (MatchWord *) xmalloc ((dict_strlen((Dict_char*) pattern)+range+2)
+ * (range+1)*sizeof(*ri));
for (i=0; i<=range; i++)
ri[i] = (2<<i)-1;
- i = dict_look_ec (dict, 1, mi, ri, 0, userfunc, range, prefix);
+ i = dict_look_ec (dict, dict->head.root, mi, ri, 0, userfunc,
+ range, prefix);
xfree (ri);
return i;
}
-
-
-