Removed stupid line. Work on insertion in dictionary. Not finished yet.

[idzebra-moved-to-github.git] / dict / dicttest.c

diff --git a/dict/dicttest.c b/dict/dicttest.c
index 86a733d..a8647c1 100644 (file)
--- a/dict/dicttest.c
+++ b/dict/dicttest.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dicttest.c,v $
- * Revision 1.1  1994-08-16 16:26:47  adam
+ * Revision 1.4  1994-09-01 17:49:37  adam
+ * Removed stupid line. Work on insertion in dictionary. Not finished yet.
+ *
+ * Revision 1.3  1994/09/01  17:44:06  adam
+ * depend include change.
+ *
+ * Revision 1.2  1994/08/18  12:40:54  adam
+ * Some development of dictionary. Not finished at all!
+ *
+ * Revision 1.1  1994/08/16  16:26:47  adam
  * Added dict.
  *
  */
@@ -14,7 +23,6 @@
 #include <stdio.h>
 
 #include <dict.h>
-#include <options.h>
 
 char *prog;
 Dict dict;
@@ -23,29 +31,34 @@ int main (int argc, char **argv)
 {
     const char *name = NULL;
     const char *inputfile = NULL;
+    const char *base = NULL;
     int rw = 0;
+    int infosize = 2;
     int cache = 10;
     int ret;
-    int verbose = 0;
     char *arg;
     
     prog = argv[0];
     if (argc < 2)
     {
         fprintf (stderr, "usage:\n"
-                         "  %s [-v n] [-i f] [-w] [-c n] file\n", prog);
+                 "  %s [-s n] [-v n] [-i f] [-w] [-c n] base file\n",
+                 prog);
         exit (1);
     }
-    while ((ret = options ("v:i:wc:", argv, argc, &arg)) != -2)
+    while ((ret = options ("s:v:i:wc:", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
-            if (name)
+            if (!base)
+                base = arg;
+            else if (!name)
+                name = arg;
+            else
             {
-                fprintf (stderr, "%s: too many files specified\n", prog);
+                log (LOG_FATAL, "too many files specified\n");
                 exit (1);
             }
-            name = arg;
         }
         else if (ret == 'c')
         {
@@ -60,23 +73,35 @@ int main (int argc, char **argv)
             inputfile = arg;
             rw = 1;
         }
+        else if (ret == 's')
+        {
+            infosize = atoi(arg);
+        }
         else if (ret == 'v')
-            verbose = atoi(arg);
+        {
+            log_init (atoi(arg), prog, NULL);
+        }
         else
         {
-            fprintf (stderr, "%s: unknown option\n", prog);
+            log (LOG_FATAL, "unknown option");
             exit (1);
         }
     }
-    if (!name)
+    if (!base || !name)
+    {
+        log (LOG_FATAL, "no base and/or dictionary specified");
+        exit (1);
+    }
+    common_resource = res_open (base);
+    if (!common_resource)
     {
-        fprintf (stderr, "%s: no dictionary file given\n", prog);
+        log (LOG_FATAL, "cannot open resource `%s'", base);
         exit (1);
     }
     dict = dict_open (name, cache, rw);
     if (!dict)
     {
-        fprintf (stderr, "%s: dict_open fail\n", prog);
+        log (LOG_FATAL, "dict_open fail of `%s'", name);
         exit (1);
     }
     if (inputfile)
@@ -84,28 +109,28 @@ int main (int argc, char **argv)
         FILE *ipf;
         char ipf_buf[256];
         char word[256];
-        int i, line = 1;
+        int line = 1;
+        char infobytes[120];
+        memset (infobytes, 0, 120);
 
         if (!(ipf = fopen(inputfile, "r")))
         {
-            fprintf (stderr, "%s: cannot open %s\n", prog, inputfile);
+            log (LOG_FATAL|LOG_ERRNO, "cannot open %s", inputfile);
             exit (1);
         }
         
         while (fgets (ipf_buf, 255, ipf))
         {
-            for (i=0; i<255; i++)
-                if (ipf_buf[i] > ' ')
-                    word[i] = ipf_buf[i];
-                else
-                    break;
-            word[i] = 0;
-            if (i)
-                dict_insert (dict, word, &line);
+            if (sscanf (ipf_buf, "%s", word) == 1)
+            {
+                sprintf (infobytes, "%d", line);
+                dict_insert (dict, word, infosize, infobytes);
+            }
             ++line;
         }
         fclose (ipf);
     }
     dict_close (dict);
+    res_close (common_resource);
     return 0;
 }