projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 2.0.61
[idzebra-moved-to-github.git]
/
dict
/
lookupec.c
diff --git
a/dict/lookupec.c
b/dict/lookupec.c
index
77042a3
..
94794e1
100644
(file)
--- a/
dict/lookupec.c
+++ b/
dict/lookupec.c
@@
-1,5
+1,5
@@
/* This file is part of the Zebra server.
/* This file is part of the Zebra server.
- Copyright (C) 1994-2011 Index Data
+ 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
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
@@
-17,6
+17,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
@@
-47,7
+50,7
@@
static int lookup_ec(Dict dict, Dict_ptr ptr,
dict_bf_readp(dict->dbf, ptr, &p);
lo = 0;
hi = DICT_nodir(p)-1;
dict_bf_readp(dict->dbf, ptr, &p);
lo = 0;
hi = DICT_nodir(p)-1;
- indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
while (lo <= hi)
{
if (indxp[-lo] > 0)
while (lo <= hi)
{
if (indxp[-lo] > 0)
@@
-95,7
+98,7
@@
static int lookup_ec(Dict dict, Dict_ptr ptr,
info = (char*)p - indxp[-lo];
memcpy(&ch, info+sizeof(Dict_ptr), sizeof(Dict_char));
prefix[pos] = ch;
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++)
sc = mi->s[ch & 255];
ri[1+range] = SH(ri[0]) & sc;
for (i=1; i<=range; i++)
@@
-117,7
+120,7
@@
static int lookup_ec(Dict dict, Dict_ptr ptr,
lookup_ec(dict, subptr, mi, ri, pos+1,
userfunc, range, prefix);
dict_bf_readp(dict->dbf, ptr, &p);
lookup_ec(dict, subptr, mi, ri, pos+1,
userfunc, range, prefix);
dict_bf_readp(dict->dbf, ptr, &p);
- indxp = (short*) ((char*) p +
+ indxp = (short*) ((char*) p +
DICT_bsize(p)-sizeof(short));
}
}
DICT_bsize(p)-sizeof(short));
}
}
@@
-153,14
+156,14
@@
int dict_lookup_ec(Dict dict, char *pattern, int range,
if (!dict->head.root)
return 0;
if (!dict->head.root)
return 0;
-
+
mi = prepare_match((Dict_char*) pattern);
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;
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;
-
+
ret = lookup_ec(dict, dict->head.root, mi, ri, 0, userfunc,
range, prefix);
xfree(ri);
ret = lookup_ec(dict, dict->head.root, mi, ri, 0, userfunc,
range, prefix);
xfree(ri);