X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzoomsh.c;h=9115bf3afc6bd9932ec331f85832b22bff9e4f65;hp=466633e1533e3f597260a7159d70d4a0657adf16;hb=37fbd309fef590f0cc0e3bc955161bcb8e37e99e;hpb=1958bfea3355304f47bd6dd2cc20b58b8c4b0f3e

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 466633e..9115bf3 100644
--- 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;
@@ -196,9 +214,8 @@ static void display_records(ZOOM_connection c,
         }
         else
         {
-            int len, opac_len;
+            int len;
             const char *render = ZOOM_record_get(rec, type, &len);
-            const char *opac_render = ZOOM_record_get(rec, "opac", &opac_len);
             const char *syntax = ZOOM_record_get(rec, "syntax", 0);
             const char *schema = ZOOM_record_get(rec, "schema", 0);
             /* if rec is non-null, we got a record for display */
@@ -215,12 +232,6 @@ static void display_records(ZOOM_connection c,
                     }
                 }
                 printf("\n");
-                if (opac_render)
-                {
-                    if (fwrite(opac_render, 1, opac_len, stdout) != (size_t) 
-                               opac_len)
-                        printf("write to stdout failed\n");
-                }
             }
         }
     }
@@ -256,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++)
     {
@@ -281,6 +291,51 @@ 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;
+
+    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);
+            }
+        }
+    }
+}
+
 static void cmd_ext(ZOOM_connection *c, ZOOM_resultset *r,
                     ZOOM_options options,
                     const char **args)
@@ -300,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++)
     {
@@ -371,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++)
     {
@@ -390,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");
         }
@@ -430,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;
@@ -474,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,
@@ -485,6 +559,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");
@@ -510,6 +585,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,
@@ -581,6 +657,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))