X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzoomsh.c;h=df83cdb0340ba2427724a8c3f936ec61a8104c73;hp=d25c67425fe5af96f112b371e49914bff4487f1c;hb=2788a4851b551e1a3efb320a2878b809f2d8a9d7;hpb=c45f2b8efebe64cf3d8d45eae18dc0fd78bc933f

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index d25c674..df83cdb 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-2009 Index Data
  * See the file LICENSE for details.
- *
- * $Id: zoomsh.c,v 1.48 2007-08-16 10:09:37 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
         {
@@ -200,19 +198,29 @@ static void display_records(ZOOM_connection c,
             const char *render = ZOOM_record_get(rec, "render", &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 */
             if (rec)
             {
-                printf("%d %s %s\n",
-                       pos, (db ? db : "unknown"), syntax);
+                printf("%d database=%s syntax=%s schema=%s\n",
+                       pos, (db ? db : "unknown"), syntax,
+                       schema ? schema : "unknown");
                 if (render)
-                    fwrite(render, 1, len, stdout);
+                {
+                    if (fwrite(render, 1, len, stdout) != (size_t) 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) != (size_t) 
+                               opac_len)
+                        printf("write to stdout failed\n");
+                }
             }
         }
-            
     }
 }
 
@@ -430,8 +438,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]);
         }