X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzoomsh.c;h=1bff1d4a2ed93f7e7e22c419c30fa9338ec3c318;hp=6a376c7c28a0250169a83b2bb8d44c2c9e629da3;hb=131f137354647cefe2e3494bdb946d77b8c2e959;hpb=7ef1b50f481cda83d012cc3d69d83f9313836f1f

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 6a376c7..1bff1d4 100644
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2009 Index Data
  * See the file LICENSE for details.
  */
 
@@ -173,7 +173,7 @@ static void cmd_close(ZOOM_connection *c, ZOOM_resultset *r,
 
 static void display_records(ZOOM_connection c,
                             ZOOM_resultset r,
-                            int start, int count)
+                            int start, int count, const char *type)
 {
     int i;
     for (i = 0; i<count; i++)
@@ -195,7 +195,7 @@ static void display_records(ZOOM_connection c,
         else
         {
             int len, opac_len;
-            const char *render = ZOOM_record_get(rec, "render", &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);
@@ -207,7 +207,7 @@ static void display_records(ZOOM_connection c,
                        schema ? schema : "unknown");
                 if (render)
                 {
-                    if (write(render, 1, len, stdout) != len)
+                    if (fwrite(render, 1, len, stdout) != (size_t) len)
                     {
                         printf("write to stdout failed\n");
                     }
@@ -215,7 +215,8 @@ static void display_records(ZOOM_connection c,
                 printf("\n");
                 if (opac_render)
                 {
-                    if (fwrite(opac_render, 1, opac_len, stdout) != opac_len)
+                    if (fwrite(opac_render, 1, opac_len, stdout) != (size_t) 
+                               opac_len)
                         printf("write to stdout failed\n");
                 }
             }
@@ -228,13 +229,18 @@ static void cmd_show(ZOOM_connection *c, ZOOM_resultset *r,
                      const char **args)
 {
     int i;
-    char start_str[10], count_str[10];
+    char start_str[10], count_str[10], render_str[60];
+    const char *type = "render";
 
     if (next_token_copy(args, start_str, sizeof(start_str)) >= 0)
         ZOOM_options_set(options, "start", start_str);
 
-    if (next_token_copy(args, count_str, sizeof(count_str)) >= 0)
-        ZOOM_options_set(options, "count", count_str);
+    if (next_token_copy(args, count_str, sizeof(count_str)) <= 0)
+        strcpy(count_str, "1");
+    ZOOM_options_set(options, "count", count_str);
+
+    if (next_token_copy(args, render_str, sizeof(render_str)) >= 0)
+        type = render_str;
 
     for (i = 0; i<MAX_CON; i++)
         ZOOM_resultset_records(r[i], 0, atoi(start_str), atoi(count_str));
@@ -257,7 +263,7 @@ static void cmd_show(ZOOM_connection *c, ZOOM_resultset *r,
             /* OK, no major errors. Display records... */
             int start = ZOOM_options_get_int(options, "start", 0);
             int count = ZOOM_options_get_int(options, "count", 0);
-            display_records(c[i], r[i], start, count);
+            display_records(c[i], r[i], start, count, type);
         }
     }
     ZOOM_options_set(options, "count", "0");
@@ -379,7 +385,7 @@ static void cmd_search(ZOOM_connection *c, ZOOM_resultset *r,
             printf("%s: %ld hits\n", ZOOM_connection_option_get(c[i], "host"),
                    (long) ZOOM_resultset_size(r[i]));
             /* and display */
-            display_records(c[i], r[i], start, count);
+            display_records(c[i], r[i], start, count, "render");
         }
     }
 }
@@ -470,7 +476,7 @@ static void cmd_help(ZOOM_connection *c, ZOOM_resultset *r,
 {
     printf("connect <zurl>\n");
     printf("search <pqf>\n");
-    printf("show [<start> [<count>]\n");
+    printf("show [<start> [<count> [<type]]]\n");
     printf("scan <term>\n");
     printf("quit\n");
     printf("close <zurl>\n");
@@ -681,6 +687,7 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab