/*
- * Copyright (C) 1994, Index Data I/S
+ * Copyright (C) 1994-1995, Index Data I/S
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: dicttest.c,v $
- * Revision 1.15 1995-09-04 12:33:31 adam
+ * Revision 1.20 1996-03-20 09:35:16 adam
+ * Function dict_lookup_grep got extra parameter, init_pos, which marks
+ * from which position in pattern approximate pattern matching should occur.
+ *
+ * Revision 1.19 1996/02/02 13:43:50 adam
+ * The public functions simply use char instead of Dict_char to represent
+ * search strings. Dict_char is used internally only.
+ *
+ * Revision 1.18 1996/02/01 20:39:52 adam
+ * Bug fix: insert didn't work on 8-bit characters due to unsigned char
+ * compares in dict_strcmp (strcmp) and signed Dict_char. Dict_char is
+ * unsigned now.
+ *
+ * Revision 1.17 1995/12/06 17:48:30 adam
+ * Bug fix: delete didn't work.
+ *
+ * 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
static int look_hits;
-static int grep_handle (Dict_char *name, char *info)
+static int grep_handle (char *name, const char *info, void *client)
{
look_hits++;
printf ("%s\n", name);
const char *name = NULL;
const char *inputfile = NULL;
const char *base = NULL;
+ int do_delete = 0;
int range = -1;
+ int srange = 0;
int rw = 0;
int infosize = 4;
int cache = 10;
char *arg;
int no_of_iterations = 0;
int no_of_new = 0, no_of_same = 0, no_of_change = 0;
- int no_of_hits = 0, no_of_misses = 0;
-
+ int no_of_hits = 0, no_of_misses = 0, no_not_found = 0, no_of_deleted = 0;
+ int max_pos;
prog = argv[0];
if (argc < 2)
{
fprintf (stderr, "usage:\n "
- " %s [-r n] [-u] [-g pat] [-s n] [-v n] [-i f] [-w] [-c n]"
- " base file\n",
+ " %s [-d] [-r n] [-p n] [-u] [-g pat] [-s n] [-v n] [-i f]"
+ " [-w] [-c n] base file\n\n",
prog);
+ fprintf (stderr, " -d delete instead of insert\n");
+ fprintf (stderr, " -r n set regular match range\n");
+ fprintf (stderr, " -p n set regular match start range\n");
+ fprintf (stderr, " -u report if keys change during insert\n");
+ fprintf (stderr, " -g p try pattern n (see -r)\n");
+ fprintf (stderr, " -s n set info size to n (instead of 4)\n");
+ fprintf (stderr, " -v n set logging level\n");
+ fprintf (stderr, " -i f read file with words\n");
+ fprintf (stderr, " -w insert/delete instead of lookup\n");
+ fprintf (stderr, " -c n cache size (number of pages)\n");
exit (1);
}
- while ((ret = options ("r:ug:s:v:i:wc:", argv, argc, &arg)) != -2)
+ while ((ret = options ("dr:p:ug:s:v:i:wc:", argv, argc, &arg)) != -2)
{
if (ret == 0)
{
exit (1);
}
}
+ else if (ret == 'd')
+ do_delete = 1;
else if (ret == 'g')
{
grep_pattern = arg;
{
range = atoi (arg);
}
+ else if (ret == 'p')
+ {
+ srange = atoi (arg);
+ }
else if (ret == 'u')
{
unique = 1;
ipf_ptr[i++] = '\0';
if (rw)
{
- switch(dict_insert (dict, ipf_ptr,
- infosize, infobytes))
- {
- case 0:
- no_of_new++;
- break;
- case 1:
- no_of_change++;
- if (unique)
- logf (LOG_LOG, "%s change\n", ipf_ptr);
- break;
- case 2:
- if (unique)
- logf (LOG_LOG, "%s duplicate\n", ipf_ptr);
- no_of_same++;
- break;
- }
+ if (do_delete)
+ switch (dict_delete (dict, ipf_ptr))
+ {
+ case 0:
+ no_not_found++;
+ break;
+ case 1:
+ no_of_deleted++;
+ }
+ else
+ switch(dict_insert (dict, ipf_ptr,
+ infosize, infobytes))
+ {
+ case 0:
+ no_of_new++;
+ break;
+ case 1:
+ no_of_change++;
+ if (unique)
+ logf (LOG_LOG, "%s change\n", ipf_ptr);
+ break;
+ case 2:
+ if (unique)
+ logf (LOG_LOG, "%s duplicate\n", ipf_ptr);
+ no_of_same++;
+ break;
+ }
}
else if(range < 0)
{
else
{
look_hits = 0;
- dict_lookup_grep (dict, ipf_ptr, range, grep_handle);
+ dict_lookup_grep (dict, ipf_ptr, range, NULL,
+ &max_pos, srange, grep_handle);
if (look_hits)
no_of_hits++;
else
if (range < 0)
range = 0;
logf (LOG_LOG, "Grepping '%s'", grep_pattern);
- dict_lookup_grep (dict, grep_pattern, range, grep_handle);
+ dict_lookup_grep (dict, grep_pattern, range, NULL, &max_pos,
+ srange, grep_handle);
}
if (rw)
{
- 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);
+ logf (LOG_LOG, "Iterations.... %d", no_of_iterations);
+ if (do_delete)
+ {
+ logf (LOG_LOG, "No of deleted. %d", no_of_deleted);
+ logf (LOG_LOG, "No not found.. %d", no_not_found);
+ }
+ else
+ {
+ logf (LOG_LOG, "No of new..... %d", no_of_new);
+ logf (LOG_LOG, "No of change.. %d", no_of_change);
+ }
}
else
{
projects / idzebra-moved-to-github.git / blobdiff