* Sebastian Hammer, Adam Dickmeiss
*
* $Log: dicttest.c,v $
- * Revision 1.12 1994-10-03 17:23:03 adam
+ * Revision 1.16 1995-10-09 16:18:31 adam
+ * Function dict_lookup_grep got extra client data parameter.
+ *
+ * Revision 1.15 1995/09/04 12:33:31 adam
+ * Various cleanup. YAZ util used instead.
+ *
+ * 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
static int look_hits;
-static int lookup_handle (Dict_char *name)
-{
- look_hits++;
- printf ("%s\n", name);
- return 0;
-}
-
-static int grep_handle (Dict_char *name, char *info)
+static int grep_handle (Dict_char *name, const char *info, void *client)
{
look_hits++;
printf ("%s\n", name);
name = arg;
else
{
- log (LOG_FATAL, "too many files specified\n");
+ logf (LOG_FATAL, "too many files specified\n");
exit (1);
}
}
}
else
{
- log (LOG_FATAL, "unknown option");
+ logf (LOG_FATAL, "Unknown option '-%s'", arg);
exit (1);
}
}
if (!base || !name)
{
- log (LOG_FATAL, "no base and/or dictionary specified");
+ logf (LOG_FATAL, "no base and/or dictionary specified");
exit (1);
}
common_resource = res_open (base);
if (!common_resource)
{
- log (LOG_FATAL, "cannot open resource `%s'", base);
+ logf (LOG_FATAL, "cannot open resource `%s'", base);
exit (1);
}
dict = dict_open (name, cache, rw);
if (!dict)
{
- log (LOG_FATAL, "dict_open fail of `%s'", name);
+ logf (LOG_FATAL, "dict_open fail of `%s'", name);
exit (1);
}
if (inputfile)
if (!(ipf = fopen(inputfile, "r")))
{
- log (LOG_FATAL|LOG_ERRNO, "cannot open %s", inputfile);
+ logf (LOG_FATAL|LOG_ERRNO, "cannot open %s", inputfile);
exit (1);
}
case 1:
no_of_change++;
if (unique)
- log (LOG_LOG, "%s change\n", ipf_ptr);
+ logf (LOG_LOG, "%s change\n", ipf_ptr);
break;
case 2:
if (unique)
- log (LOG_LOG, "%s duplicate\n", ipf_ptr);
+ logf (LOG_LOG, "%s duplicate\n", ipf_ptr);
no_of_same++;
break;
}
else
{
look_hits = 0;
- dict_lookup_ec (dict, ipf_ptr, range, lookup_handle);
+ dict_lookup_grep (dict, ipf_ptr, range, NULL,
+ grep_handle);
if (look_hits)
no_of_hits++;
else
}
fclose (ipf);
}
- if (rw)
+ if (grep_pattern)
{
- log (LOG_LOG, "Insertions.... %d", no_of_iterations);
- log (LOG_LOG, "No of new..... %d", no_of_new);
- log (LOG_LOG, "No of change.. %d", no_of_change);
- log (LOG_LOG, "No of same.... %d", no_of_same);
+ if (range < 0)
+ range = 0;
+ logf (LOG_LOG, "Grepping '%s'", grep_pattern);
+ dict_lookup_grep (dict, grep_pattern, range, NULL, grep_handle);
}
- else
+ if (rw)
{
- log (LOG_LOG, "Lookups....... %d", no_of_iterations);
- log (LOG_LOG, "No of hits.... %d", no_of_hits);
- log (LOG_LOG, "No of misses.. %d", no_of_misses);
+ logf (LOG_LOG, "Insertions.... %d", no_of_iterations);
+ logf (LOG_LOG, "No of new..... %d", no_of_new);
+ logf (LOG_LOG, "No of change.. %d", no_of_change);
+ logf (LOG_LOG, "No of same.... %d", no_of_same);
}
- if (grep_pattern)
+ else
{
- if (range < 0)
- range = 0;
- log (LOG_LOG, "Grepping '%s'", grep_pattern);
- dict_lookup_grep (dict, grep_pattern, range, grep_handle);
+ logf (LOG_LOG, "Lookups....... %d", no_of_iterations);
+ logf (LOG_LOG, "No of hits.... %d", no_of_hits);
+ logf (LOG_LOG, "No of misses.. %d", no_of_misses);
}
dict_close (dict);
res_close (common_resource);