* Sebastian Hammer, Adam Dickmeiss
*
* $Log: dicttest.c,v $
- * Revision 1.11 1994-09-28 13:07:09 adam
+ * Revision 1.14 1994-10-04 17:46:55 adam
+ * Function options now returns arg with error option.
+ *
+ * Revision 1.13 1994/10/04 12:08:05 adam
+ * Some bug fixes and some optimizations.
+ *
+ * Revision 1.12 1994/10/03 17:23:03 adam
+ * First version of dictionary lookup with regular expressions and errors.
+ *
+ * Revision 1.11 1994/09/28 13:07:09 adam
* Use log_mask_str now.
*
* Revision 1.10 1994/09/26 10:17:24 adam
static int look_hits;
-static int lookup_handle (Dict_char *name)
+static int grep_handle (Dict_char *name, char *info)
{
look_hits++;
printf ("%s\n", name);
int cache = 10;
int ret;
int unique = 0;
+ char *grep_pattern = NULL;
char *arg;
int no_of_iterations = 0;
int no_of_new = 0, no_of_same = 0, no_of_change = 0;
if (argc < 2)
{
fprintf (stderr, "usage:\n "
- " %s [-r n] [-u] [-s n] [-v n] [-i f] [-w] [-c n]"
+ " %s [-r n] [-u] [-g pat] [-s n] [-v n] [-i f] [-w] [-c n]"
" base file\n",
prog);
exit (1);
}
- while ((ret = options ("r:us:v:i:wc:", argv, argc, &arg)) != -2)
+ while ((ret = options ("r:ug:s:v:i:wc:", argv, argc, &arg)) != -2)
{
if (ret == 0)
{
exit (1);
}
}
+ else if (ret == 'g')
+ {
+ grep_pattern = arg;
+ }
else if (ret == 'r')
{
range = atoi (arg);
}
else
{
- log (LOG_FATAL, "unknown option");
+ log (LOG_FATAL, "Unknown option '-%s'", arg);
exit (1);
}
}
else
{
look_hits = 0;
- dict_lookup_ec (dict, ipf_ptr, range, lookup_handle);
+ dict_lookup_grep (dict, ipf_ptr, range, grep_handle);
if (look_hits)
no_of_hits++;
else
}
fclose (ipf);
}
+ if (grep_pattern)
+ {
+ if (range < 0)
+ range = 0;
+ log (LOG_LOG, "Grepping '%s'", grep_pattern);
+ dict_lookup_grep (dict, grep_pattern, range, grep_handle);
+ }
if (rw)
{
log (LOG_LOG, "Insertions.... %d", no_of_iterations);