Added YAZ in aclocal.m4.

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

diff --git a/dict/dicttest.c b/dict/dicttest.c
index 849111e..28d971c 100644 (file)
--- a/dict/dicttest.c
+++ b/dict/dicttest.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dicttest.c,v $
- * Revision 1.20  1996-03-20 09:35:16  adam
+ * Revision 1.24  2000-09-05 14:04:05  adam
+ * Updates for prefix 'yaz_' for YAZ log functions.
+ *
+ * Revision 1.23  2000/07/07 12:49:20  adam
+ * Optimized resultSetInsert{Rank,Sort}.
+ *
+ * Revision 1.22  1999/02/02 14:50:19  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.21  1996/10/29 14:00:03  adam
+ * Page size given by DICT_DEFAULT_PAGESIZE in dict.h.
+ *
+ * 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.
  *
@@ -81,6 +93,7 @@
 #include <ctype.h>
 
 #include <dict.h>
+#include <zebrautl.h>
 
 char *prog;
 static Dict dict;
@@ -96,9 +109,11 @@ static int grep_handle (char *name, const char *info, void *client)
 
 int main (int argc, char **argv)
 {
+    Res my_resource = 0;
+    BFiles bfs;
     const char *name = NULL;
     const char *inputfile = NULL;
-    const char *base = NULL;
+    const char *config = NULL;
     int do_delete = 0;
     int range = -1;
     int srange = 0;
@@ -119,7 +134,7 @@ int main (int argc, char **argv)
     {
         fprintf (stderr, "usage:\n "
                  " %s [-d] [-r n] [-p n] [-u] [-g pat] [-s n] [-v n] [-i f]"
-                 " [-w] [-c n] base file\n\n",
+                 " [-w] [-c n] config file\n\n",
                  prog);
         fprintf (stderr, "  -d      delete instead of insert\n");
         fprintf (stderr, "  -r n    set regular match range\n");
@@ -137,8 +152,8 @@ int main (int argc, char **argv)
     {
         if (ret == 0)
         {
-            if (!base)
-                base = arg;
+            if (!config)
+                config = arg;
             else if (!name)
                 name = arg;
             else
@@ -181,7 +196,7 @@ int main (int argc, char **argv)
         }
         else if (ret == 'v')
         {
-            log_init (log_mask_str(arg), prog, NULL);
+            yaz_log_init (yaz_log_mask_str(arg), prog, NULL);
         }
         else
         {
@@ -189,18 +204,24 @@ int main (int argc, char **argv)
             exit (1);
         }
     }
-    if (!base || !name)
+    if (!config || !name)
+    {
+        logf (LOG_FATAL, "no config and/or dictionary specified");
+        exit (1);
+    }
+    my_resource = res_open (config);
+    if (!my_resource)
     {
-        logf (LOG_FATAL, "no base and/or dictionary specified");
+        logf (LOG_FATAL, "cannot open resource `%s'", config);
         exit (1);
     }
-    common_resource = res_open (base);
-    if (!common_resource)
+    bfs = bfs_create (res_get(my_resource, "register"));
+    if (!bfs)
     {
-        logf (LOG_FATAL, "cannot open resource `%s'", base);
+        logf (LOG_FATAL, "bfs_create fail");
         exit (1);
     }
-    dict = dict_open (name, cache, rw);
+    dict = dict_open (bfs, name, cache, rw, 0);
     if (!dict)
     {
         logf (LOG_FATAL, "dict_open fail of `%s'", name);
@@ -285,6 +306,10 @@ int main (int argc, char **argv)
                             no_of_misses++;
                     }
                     ++no_of_iterations;
+                   if ((no_of_iterations % 10000) == 0)
+                   {
+                       printf ("."); fflush(stdout);
+                   }
                     ipf_ptr += (i-1);
                 }
             }
@@ -321,6 +346,7 @@ int main (int argc, char **argv)
         logf (LOG_LOG, "No of misses.. %d", no_of_misses);
     }
     dict_close (dict);
-    res_close (common_resource);
+    bfs_destroy (bfs);
+    res_close (my_resource);
     return 0;
 }