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
Updated dictionary. Implemented "compression" of dictionary.
[idzebra-moved-to-github.git]
/
dict
/
lookgrep.c
diff --git
a/dict/lookgrep.c
b/dict/lookgrep.c
index
39d2b3f
..
4b651dc
100644
(file)
--- a/
dict/lookgrep.c
+++ b/
dict/lookgrep.c
@@
-1,10
+1,16
@@
/*
/*
- * Copyright (C) 1994-1998, Index Data I/S
+ * Copyright (C) 1994-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: lookgrep.c,v $
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: lookgrep.c,v $
- * Revision 1.21 1998-06-24 12:16:12 adam
+ * Revision 1.23 1999-05-15 14:36:37 adam
+ * Updated dictionary. Implemented "compression" of dictionary.
+ *
+ * Revision 1.22 1999/02/02 14:50:23 adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.21 1998/06/24 12:16:12 adam
* Support for relations on text operands. Open range support in
* DFA module (i.e. [-j], [g-]).
*
* Support for relations on text operands. Open range support in
* DFA module (i.e. [-j], [g-]).
*
@@
-301,7
+307,7
@@
static int dict_grep (Dict dict, Dict_ptr ptr, MatchContext *mc,
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_pagesize(dict)-sizeof(short));
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
while (lo <= hi)
{
while (lo <= hi)
{
@@
-401,8
+407,7
@@
static int dict_grep (Dict dict, Dict_ptr ptr, MatchContext *mc,
init_pos))
return 1;
dict_bf_readp (dict->dbf, ptr, &p);
init_pos))
return 1;
dict_bf_readp (dict->dbf, ptr, &p);
- indxp = (short*) ((char*) p+DICT_pagesize(dict)
- -sizeof(short));
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
}
}
}
}
}
}
@@
-468,8
+473,9
@@
int dict_lookup_grep (Dict dict, const char *pattern, int range, void *client,
}
}
*max_pos = 0;
}
}
*max_pos = 0;
- if (dict->head.last > 1)
- i = dict_grep (dict, 1, mc, Rj, 0, client, userfunc, prefix,
+ if (dict->head.root)
+ i = dict_grep (dict, dict->head.root, mc, Rj, 0, client,
+ userfunc, prefix,
dfa, max_pos, init_pos);
else
i = 0;
dfa, max_pos, init_pos);
else
i = 0;