zoomsh: remove unused code for cmd facets

[yaz-moved-to-github.git] / zoom / zoomsh.c

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 8469ce4..9115bf3 100644 (file)
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,17 +1,19 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2011 Index Data
  * See the file LICENSE for details.
  */
-
 /** \file zoomsh.c
     \brief ZOOM C command line tool (shell)
 */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <yaz/wrbuf.h>
+#include <yaz/log.h>
 
 #if HAVE_READLINE_READLINE_H
 #include <readline/readline.h> 
@@ -25,6 +27,22 @@
 
 #define MAX_CON 100
 
+static void process_events(ZOOM_connection *c)
+{
+    int i;
+
+    yaz_log(YLOG_DEBUG, "process_events");
+    while ((i = ZOOM_event(MAX_CON, c)) != 0)
+    {
+        int peek = ZOOM_connection_peek_event(c[i-1]);
+        int event = ZOOM_connection_last_event(c[i-1]);
+        yaz_log(YLOG_DEBUG, "no = %d peek = %d event = %d %s", i-1,
+                peek,
+                event,
+                ZOOM_get_event_str(event));
+    }
+}
+
 static int next_token(const char **cpp, const char **t_start)
 {
     int len = 0;
@@ -249,8 +267,7 @@ static void cmd_show(ZOOM_connection *c, ZOOM_resultset *r,
 
     for (i = 0; i < MAX_CON; i++)
         ZOOM_resultset_records(r[i], 0, start, count);
-    while (ZOOM_event(MAX_CON, c))
-        ;
+    process_events(c);
 
     for (i = 0; i < MAX_CON; i++)
     {
@@ -294,38 +311,8 @@ static void cmd_facets(ZOOM_connection *c, ZOOM_resultset *r,
                      const char **args)
 {
     int i;
-    size_t start = 0, count = 1;
-    const char *type = "render";
-    WRBUF render_str = 0;
 
-    if (0)
-    {
-        WRBUF tmp;
-
-        if ((tmp = next_token_new_wrbuf(args)))
-        {
-            start = atoi(wrbuf_cstr(tmp));
-            wrbuf_destroy(tmp);
-        }
-
-        if ((tmp = next_token_new_wrbuf(args)))
-        {
-            count = atoi(wrbuf_cstr(tmp));
-            wrbuf_destroy(tmp);
-        }
-        render_str = next_token_new_wrbuf(args);
-    }
-    if (render_str)
-        type = wrbuf_cstr(render_str);
-
-    /*
-    for (i = 0; i < MAX_CON; i++) {
-        int num_facets = ZOOM_resultset_facet_size(r[i]);
-        ZOOM_resultset_records(r[i], 0, start, count);
-    }
-    */
-    while (ZOOM_event(MAX_CON, c))
-        ;
+    process_events(c);
 
     for (i = 0; i < MAX_CON; i++)
     {
@@ -347,9 +334,6 @@ static void cmd_facets(ZOOM_connection *c, ZOOM_resultset *r,
             }
         }
     }
-    if (render_str)
-        wrbuf_destroy(render_str);
-
 }
 
 static void cmd_ext(ZOOM_connection *c, ZOOM_resultset *r,
@@ -371,8 +355,7 @@ static void cmd_ext(ZOOM_connection *c, ZOOM_resultset *r,
             p[i] = 0;
     }
 
-    while (ZOOM_event(MAX_CON, c))
-        ;
+    process_events(c);
 
     for (i = 0; i<MAX_CON; i++)
     {
@@ -442,8 +425,7 @@ static void cmd_search(ZOOM_connection *c, ZOOM_resultset *r,
     }
     ZOOM_query_destroy(s);
 
-    while (ZOOM_event(MAX_CON, c))
-        ;
+    process_events(c);
 
     for (i = 0; i<MAX_CON; i++)
     {
@@ -461,9 +443,31 @@ static void cmd_search(ZOOM_connection *c, ZOOM_resultset *r,
             /* OK, no major errors. Look at the result count */
             int start = ZOOM_options_get_int(options, "start", 0);
             int count = ZOOM_options_get_int(options, "count", 0);
+            int facet_num;
 
             printf("%s: %lld hits\n", ZOOM_connection_option_get(c[i], "host"),
                    (long long int) ZOOM_resultset_size(r[i]));
+            
+            facet_num = ZOOM_resultset_facets_size(r[i]);
+            if (facet_num)
+            {
+                ZOOM_facet_field *facets = ZOOM_resultset_facets(r[i]);
+                int facet_idx;
+                for (facet_idx = 0; facet_idx < facet_num; facet_idx++)
+                {
+                    const char *name = ZOOM_facet_field_name(facets[facet_idx]);
+                    size_t term_idx;
+                    size_t term_num = ZOOM_facet_field_term_count(facets[facet_idx]);
+                    printf("facet: %s\n", name);
+                    for (term_idx = 0; term_idx < term_num; term_idx++ )
+                    {
+                        int freq;
+                        const char *term =
+                            ZOOM_facet_field_get_term(facets[facet_idx], term_idx, &freq);
+                        printf("term: %s %d\n", term, freq);
+                    }
+                }
+            }
             /* and display */
             display_records(c[i], r[i], start, count, "render");
         }
@@ -501,8 +505,8 @@ static void cmd_scan(ZOOM_connection *c, ZOOM_resultset *r,
     }
     ZOOM_query_destroy(query);
 
-    while (ZOOM_event(MAX_CON, c))
-        ;
+    process_events(c);
+
     for (i = 0; i<MAX_CON; i++)
     {
         int error;
@@ -545,8 +549,7 @@ static void cmd_sort(ZOOM_connection *c, ZOOM_resultset *r,
         if (r[i])
             ZOOM_resultset_sort(r[i], "yaz", sort_spec);
     }
-    while (ZOOM_event(MAX_CON, c))
-        ;
+    process_events(c);
 }
 
 static void cmd_help(ZOOM_connection *c, ZOOM_resultset *r,