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

diff --git a/dict/dicttest.c b/dict/dicttest.c
index bc34640..70dd138 100644
--- a/dict/dicttest.c
+++ b/dict/dicttest.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dicttest.c,v $
- * Revision 1.12  1994-10-03 17:23:03  adam
+ * 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
@@ -59,13 +68,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++;
@@ -110,7 +112,7 @@ 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);
             }
         }
@@ -146,25 +148,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)
@@ -177,7 +179,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);
         }
         
@@ -206,11 +208,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;
                         }
@@ -228,7 +230,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,26 +244,26 @@ int main (int argc, char **argv)
         }
         fclose (ipf);
     }
-    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);
-    }
-    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);
-    }
     if (grep_pattern)
     {
         if (range < 0)
             range = 0;
-        log (LOG_LOG, "Grepping '%s'", grep_pattern);
+        logf (LOG_LOG, "Grepping '%s'", grep_pattern);
         dict_lookup_grep (dict, grep_pattern, range, 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);
+    }
+    else
+    {
+        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);
     return 0;