Use yaz_log to print info about events; not printf

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

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 3780d50..8c06f12 100644 (file)
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -12,6 +12,7 @@
 #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 +26,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 +266,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++)
     {
@@ -274,6 +290,77 @@ static void cmd_show(ZOOM_connection *c, ZOOM_resultset *r,
        
 }
 
+static void display_facets(ZOOM_facet_field *facets, int count) {
+    int index;
+    printf("Facets: \n");
+    for (index = 0; index <  count; index++) {
+        int term_index;
+        const char *facet_name = ZOOM_facet_field_name(facets[index]);
+        printf("  %s: \n", facet_name);
+        for (term_index = 0; term_index < ZOOM_facet_field_term_count(facets[index]); term_index++) {
+            int freq = 0;
+            const char *term = ZOOM_facet_field_get_term(facets[index], term_index, &freq);
+            printf("    %s(%d) \n", term,  freq);
+        }
+    }
+}
+
+static void cmd_facets(ZOOM_connection *c, ZOOM_resultset *r,
+                     ZOOM_options options,
+                     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);
+
+    process_events(c);
+
+    for (i = 0; i < MAX_CON; i++)
+    {
+        int error;
+        const char *errmsg, *addinfo, *dset;
+        /* display errors if any */
+        if (!c[i])
+            continue;
+        if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
+            printf("%s error: %s (%s:%d) %s\n",
+                   ZOOM_connection_option_get(c[i], "host"), errmsg,
+                   dset, error, addinfo);
+        else if (r[i])
+        {
+            int num_facets = ZOOM_resultset_facets_size(r[i]);
+            if (num_facets) {
+                ZOOM_facet_field  *facets = ZOOM_resultset_facets(r[i]);
+                display_facets(facets, num_facets);
+            }
+        }
+    }
+    if (render_str)
+        wrbuf_destroy(render_str);
+
+}
+
 static void cmd_ext(ZOOM_connection *c, ZOOM_resultset *r,
                     ZOOM_options options,
                     const char **args)
@@ -293,8 +380,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++)
     {
@@ -364,8 +450,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++)
     {
@@ -423,8 +508,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;
@@ -467,8 +552,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,
@@ -478,6 +562,7 @@ static void cmd_help(ZOOM_connection *c, ZOOM_resultset *r,
     printf("connect <zurl>\n");
     printf("search <pqf>\n");
     printf("show [<start> [<count> [<type]]]\n");
+    printf("facets\n");
     printf("scan <term>\n");
     printf("quit\n");
     printf("close <zurl>\n");
@@ -503,6 +588,7 @@ static void cmd_help(ZOOM_connection *c, ZOOM_resultset *r,
     printf(" charset\n");
     printf(" lang\n");
     printf(" timeout\n");
+    printf(" facets\n");
 }
 
 static void cmd_connect(ZOOM_connection *c, ZOOM_resultset *r,
@@ -574,6 +660,8 @@ static int cmd_parse(ZOOM_connection *c, ZOOM_resultset *r,
         cmd_connect(c, r, options, buf);
     else if (is_command("search", cmd_str, cmd_len))
         cmd_search(c, r, options, buf);
+    else if (is_command("facets", cmd_str, cmd_len))
+        cmd_facets(c, r, options, buf);
     else if (is_command("find", cmd_str, cmd_len))
         cmd_search(c, r, options, buf);
     else if (is_command("show", cmd_str, cmd_len))