X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=dict%2Fdicttest.c;h=b5994d84ef189b18435d9d446d5e9f58339117f9;hb=400055a9f298ff9d5689dcf292c84f8cafff4697;hp=c461b84fbcf30c4875b7bdb4000ebb2de7b50416;hpb=60603b577514c9e6559d37e11b4ce3aa26e51be3;p=idzebra-moved-to-github.git

diff --git a/dict/dicttest.c b/dict/dicttest.c
index c461b84..b5994d8 100644
--- a/dict/dicttest.c
+++ b/dict/dicttest.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dicttest.c,v $
- * Revision 1.11  1994-09-28 13:07:09  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
  * Use log_mask_str now.
  *
  * Revision 1.10  1994/09/26  10:17:24  adam
@@ -56,7 +71,7 @@ static Dict dict;
 
 static int look_hits;
 
-static int lookup_handle (Dict_char *name)
+static int grep_handle (Dict_char *name, const char *info, void *client)
 {
     look_hits++;
     printf ("%s\n", name);
@@ -74,6 +89,7 @@ int main (int argc, char **argv)
     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;
@@ -84,12 +100,12 @@ int main (int argc, char **argv)
     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)
         {
@@ -99,10 +115,14 @@ int main (int argc, char **argv)
                 name = arg;
             else
             {
-                log (LOG_FATAL, "too many files specified\n");
+                logf (LOG_FATAL, "too many files specified\n");
                 exit (1);
             }
         }
+        else if (ret == 'g')
+        {
+            grep_pattern = arg;
+        }
         else if (ret == 'r')
         {
             range = atoi (arg);
@@ -131,25 +151,25 @@ int main (int argc, char **argv)
         }
         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)
@@ -162,7 +182,7 @@ int main (int argc, char **argv)
 
         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);
         }
         
@@ -191,11 +211,11 @@ int main (int argc, char **argv)
                         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;
                         }
@@ -213,7 +233,8 @@ int main (int argc, char **argv)
                     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
@@ -227,18 +248,25 @@ int main (int argc, char **argv)
         }
         fclose (ipf);
     }
+    if (grep_pattern)
+    {
+        if (range < 0)
+            range = 0;
+        logf (LOG_LOG, "Grepping '%s'", grep_pattern);
+        dict_lookup_grep (dict, grep_pattern, range, NULL, grep_handle);
+    }
     if (rw)
     {
-        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);
+        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);
     }
     else
     {
-        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, "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);