X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Fdicttest.c;h=57f1119d7c40eb23818cb0db57de8aaa4a21a214;hb=e5ebc859654d84aa9098142b34015648d8e333de;hp=5538b497b53b487b21b0c48fe5df991a35f1c002;hpb=1c3797bc503c1e7a109c8887d89d3ddda93bba71;p=idzebra-moved-to-github.git

diff --git a/dict/dicttest.c b/dict/dicttest.c
index 5538b49..57f1119 100644
--- a/dict/dicttest.c
+++ b/dict/dicttest.c
@@ -1,10 +1,16 @@
 /*
- * Copyright (C) 1994-1999, Index Data
+ * Copyright (C) 1994-2000, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dicttest.c,v $
- * Revision 1.23  2000-07-07 12:49:20  adam
+ * Revision 1.25  2000-12-05 09:59:10  adam
+ * Work on dict_delete_subtree.
+ *
+ * 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
@@ -97,13 +103,19 @@ static Dict dict;
 
 static int look_hits;
 
-static int grep_handle (char *name, const char *info, void *client)
+static int grep_handler (char *name, const char *info, void *client)
 {
     look_hits++;
     printf ("%s\n", name);
     return 0;
 }
 
+static int scan_handler (char *name, const char *info, int pos, void *client)
+{
+    printf ("%s\n", name);
+    return 0;
+}
+
 int main (int argc, char **argv)
 {
     Res my_resource = 0;
@@ -111,6 +123,8 @@ int main (int argc, char **argv)
     const char *name = NULL;
     const char *inputfile = NULL;
     const char *config = NULL;
+    const char *delete_term = NULL;
+    int scan_the_thing = 0;
     int do_delete = 0;
     int range = -1;
     int srange = 0;
@@ -130,10 +144,11 @@ int main (int argc, char **argv)
     if (argc < 2)
     {
         fprintf (stderr, "usage:\n "
-                 " %s [-d] [-r n] [-p n] [-u] [-g pat] [-s n] [-v n] [-i f]"
-                 " [-w] [-c n] config file\n\n",
+                 " %s [-d] [-D t] [-S] [-r n] [-p n] [-u] [-g pat] [-s n] "
+                 "[-v n] [-i f] [-w] [-c n] config file\n\n",
                  prog);
         fprintf (stderr, "  -d      delete instead of insert\n");
+        fprintf (stderr, "  -D t    delete subtree instead of insert\n");
         fprintf (stderr, "  -r n    set regular match range\n");
         fprintf (stderr, "  -p n    set regular match start range\n");
         fprintf (stderr, "  -u      report if keys change during insert\n");
@@ -143,9 +158,10 @@ int main (int argc, char **argv)
         fprintf (stderr, "  -i f    read file with words\n");
         fprintf (stderr, "  -w      insert/delete instead of lookup\n");
         fprintf (stderr, "  -c n    cache size (number of pages)\n");
+        fprintf (stderr, "  -S      scan the dictionary\n");
         exit (1);
     }
-    while ((ret = options ("dr:p:ug:s:v:i:wc:", argv, argc, &arg)) != -2)
+    while ((ret = options ("D:Sdr:p:ug:s:v:i:wc:", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
@@ -159,6 +175,10 @@ int main (int argc, char **argv)
                 exit (1);
             }
         }
+	else if (ret == 'D')
+	{
+	    delete_term = arg;
+	}
         else if (ret == 'd')
             do_delete = 1;
         else if (ret == 'g')
@@ -187,13 +207,15 @@ int main (int argc, char **argv)
             rw = 1;
         else if (ret == 'i')
             inputfile = arg;
+	else if (ret == 'S')
+	    scan_the_thing = 1;
         else if (ret == 's')
         {
             infosize = atoi(arg);
         }
         else if (ret == 'v')
         {
-            log_init (log_mask_str(arg), prog, NULL);
+            yaz_log_init (yaz_log_mask_str(arg), prog, NULL);
         }
         else
         {
@@ -254,7 +276,7 @@ int main (int argc, char **argv)
                         ipf_ptr[i++] = '\0';
                     if (rw)
                     {
-                        if (do_delete)
+			if (do_delete)
                             switch (dict_delete (dict, ipf_ptr))
                             {
                             case 0:
@@ -296,7 +318,7 @@ int main (int argc, char **argv)
                     {
                         look_hits = 0;
                         dict_lookup_grep (dict, ipf_ptr, range, NULL,
-                                          &max_pos, srange, grep_handle);
+                                          &max_pos, srange, grep_handler);
                         if (look_hits)
                             no_of_hits++;
                         else
@@ -314,13 +336,18 @@ int main (int argc, char **argv)
         }
         fclose (ipf);
     }
+    if (rw && delete_term)
+    {
+	logf (LOG_LOG, "dict_delete_subtree %s", delete_term);
+	dict_delete_subtree (dict, delete_term, 0, 0);
+    }
     if (grep_pattern)
     {
         if (range < 0)
             range = 0;
         logf (LOG_LOG, "Grepping '%s'", grep_pattern);
         dict_lookup_grep (dict, grep_pattern, range, NULL, &max_pos,
-                          srange, grep_handle);
+                          srange, grep_handler);
     }
     if (rw)
     {
@@ -342,6 +369,17 @@ int main (int argc, char **argv)
         logf (LOG_LOG, "No of hits.... %d", no_of_hits);
         logf (LOG_LOG, "No of misses.. %d", no_of_misses);
     }
+    if (scan_the_thing)
+    {
+	char term_dict[1024];
+        
+	int before = 1000000;
+	int after = 1000000;
+	logf (LOG_LOG, "dict_scan");
+	term_dict[0] = 1;
+	term_dict[1] = 0;
+	dict_scan (dict, term_dict, &before, &after, 0, scan_handler);
+    }
     dict_close (dict);
     bfs_destroy (bfs);
     res_close (my_resource);