X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzoomsh.c;h=2cbd6d4f540821b8f995d057ac4cc4d302d9f738;hp=16683670685c71318c4f26881c56e56808d79dc9;hb=4936dff1c451bc76df80ddad8557c2396526f843;hpb=f9747584f933039d25a9ba450f362d61733d14ea

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 1668367..2cbd6d4 100644
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: zoomsh.c,v 1.49 2007-09-08 06:17:45 adam Exp $
  */
 
 /** \file zoomsh.c
@@ -192,7 +190,7 @@ static void display_records(ZOOM_connection c,
             int error = ZOOM_record_error(rec, &msg, &addinfo, &diagset);
             
             printf("%d %s: %s (%s:%d) %s\n", pos, (db ? db : "unknown"),
-                   msg, diagset, error, addinfo);
+                   msg, diagset, error, addinfo ? addinfo : "none");
         }
         else
         {
@@ -208,10 +206,18 @@ static void display_records(ZOOM_connection c,
                        pos, (db ? db : "unknown"), syntax,
                        schema ? schema : "unknown");
                 if (render)
-                    fwrite(render, 1, len, stdout);
+                {
+                    if (fwrite(render, 1, len, stdout) != len)
+                    {
+                        printf("write to stdout failed\n");
+                    }
+                }
                 printf("\n");
                 if (opac_render)
-                    fwrite(opac_render, 1, opac_len, stdout);
+                {
+                    if (fwrite(opac_render, 1, opac_len, stdout) != opac_len)
+                        printf("write to stdout failed\n");
+                }
             }
         }
     }
@@ -431,8 +437,8 @@ static void cmd_scan(ZOOM_connection *c, ZOOM_resultset *r,
                 int len = 0;
                 const char *term = ZOOM_scanset_display_term(s[i], p,
                                                              &occ, &len);
-                fwrite(term, 1, len, stdout);
-                printf(" %d\n", occ);
+                
+                printf("%.*s %d\n", len, term, occ);
             }            
             ZOOM_scanset_destroy(s[i]);
         }