* Sebastian Hammer, Adam Dickmeiss
*
* $Log: lookgrep.c,v $
- * Revision 1.6 1995-10-09 16:18:32 adam
+ * Revision 1.11 1995-12-06 14:43:02 adam
+ * New function: dict_delete.
+ *
+ * Revision 1.10 1995/11/16 17:00:44 adam
+ * Changed stupid log.
+ *
+ * Revision 1.9 1995/10/27 13:58:09 adam
+ * Makes 'Database unavailable' diagnostic.
+ *
+ * Revision 1.8 1995/10/19 14:57:21 adam
+ * New feature: grep lookup saves length of longest prefix match.
+ *
+ * Revision 1.7 1995/10/17 18:01:22 adam
+ * Userfunc may return non-zero in which case the the grepping stops
+ * immediately.
+ *
+ * Revision 1.6 1995/10/09 16:18:32 adam
* Function dict_lookup_grep got extra client data parameter.
*
* Revision 1.5 1995/09/14 11:52:59 adam
static int dict_grep (Dict dict, Dict_ptr ptr, MatchContext *mc,
MatchWord *Rj, int pos, void *client,
int (*userfunc)(Dict_char *, const char *, void *),
- Dict_char *prefix, struct DFA *dfa)
+ Dict_char *prefix, struct DFA *dfa,
+ int *max_pos)
{
int lo, hi, d;
void *p;
memcpy (&ch, info+j*sizeof(Dict_char), sizeof(Dict_char));
prefix[pos+j] = ch;
+ if (pos+j > *max_pos)
+ *max_pos = pos+j;
if (ch == DICT_EOS)
{
if (was_match)
- (*userfunc)(prefix, info+(j+1)*sizeof(Dict_char),
- client);
+ if ((*userfunc)(prefix, info+(j+1)*sizeof(Dict_char),
+ client))
+ return 1;
break;
}
move (mc, Rj1, Rj0, ch, dfa, Rj_tmp);
memcpy (&ch, info+sizeof(Dict_ptr), sizeof(Dict_char));
prefix[pos] = ch;
+ if (pos > *max_pos)
+ *max_pos = pos;
move (mc, Rj1, Rj, ch, dfa, Rj_tmp);
for (d = mc->n; --d >= 0; )
if (Rj1[mc->range*mc->n + d])
if (Rj1[mc->range*mc->n + d] & mc->match_mask[d])
{
prefix[pos+1] = DICT_EOS;
- (*userfunc)(prefix, info+sizeof(Dict_ptr)+
- sizeof(Dict_char), client);
+ if ((*userfunc)(prefix, info+sizeof(Dict_ptr)+
+ sizeof(Dict_char), client))
+ return 1;
break;
}
}
memcpy (&subptr, info, sizeof(Dict_ptr));
if (subptr)
{
- dict_grep (dict, subptr, mc, Rj1, pos+1,
- client, userfunc, prefix, dfa);
+ if (dict_grep (dict, subptr, mc, Rj1, pos+1,
+ client, userfunc, prefix, dfa, max_pos))
+ return 1;
dict_bf_readp (dict->dbf, ptr, &p);
indxp = (short*) ((char*) p+DICT_pagesize(dict)
-sizeof(short));
}
int dict_lookup_grep (Dict dict, Dict_char *pattern, int range, void *client,
- int (*userfunc)(Dict_char *name, const char *info,
- void *client))
+ int *max_pos,
+ int (*userfunc)(Dict_char *name, const char *info,
+ void *client))
{
MatchWord *Rj;
Dict_char prefix[MAX_LENGTH+1];
struct DFA *dfa = dfa_init();
int i, d;
+ logf (LOG_DEBUG, "dict_lookup_grep '%s' range=%d", pattern, range);
i = dfa_parse (dfa, &this_pattern);
if (i || *this_pattern)
{
}
}
}
- i = dict_grep (dict, 1, mc, Rj, 0, client, userfunc, prefix, dfa);
-
+ *max_pos = 0;
+ i = dict_grep (dict, 1, mc, Rj, 0, client, userfunc, prefix, dfa,
+ max_pos);
+ logf (LOG_DEBUG, "max_pos = %d", *max_pos);
dfa_delete (&dfa);
xfree (Rj);
rm_MatchContext (&mc);