X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Fdicttest.c;h=1ba36b79228f9ff82adeb74c15ae7358ea3b3989;hb=1b29b77f09ae310c41f9cd0a6eeea2d562b7729e;hp=bc34640686222c86d9f0c576d32e76bb7f7704bb;hpb=e9b13c0966913e073e98f9c5d7c5f4deed7c4c46;p=idzebra-moved-to-github.git

diff --git a/dict/dicttest.c b/dict/dicttest.c
index bc34640..1ba36b7 100644
--- a/dict/dicttest.c
+++ b/dict/dicttest.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dicttest.c,v $
- * Revision 1.12  1994-10-03 17:23:03  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
@@ -59,13 +65,6 @@ static Dict dict;
 
 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)
 {
     look_hits++;
@@ -146,7 +145,7 @@ int main (int argc, char **argv)
         }
         else
         {
-            log (LOG_FATAL, "unknown option");
+            log (LOG_FATAL, "Unknown option '-%s'", arg);
             exit (1);
         }
     }
@@ -228,7 +227,7 @@ 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, grep_handle);
                         if (look_hits)
                             no_of_hits++;
                         else
@@ -242,6 +241,13 @@ int main (int argc, char **argv)
         }
         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);
@@ -255,13 +261,6 @@ int main (int argc, char **argv)
         log (LOG_LOG, "No of hits.... %d", no_of_hits);
         log (LOG_LOG, "No of misses.. %d", no_of_misses);
     }
-    if (grep_pattern)
-    {
-        if (range < 0)
-            range = 0;
-        log (LOG_LOG, "Grepping '%s'", grep_pattern);
-        dict_lookup_grep (dict, grep_pattern, range, grep_handle);
-    }
     dict_close (dict);
     res_close (common_resource);
     return 0;