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

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index d25c674..f575294 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.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,11 +198,13 @@ 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);
                 printf("\n");
@@ -212,7 +212,6 @@ static void display_records(ZOOM_connection c,
                     fwrite(opac_render, 1, opac_len, stdout);
             }
         }
-            
     }
 }