Fix crash in record conv rule select YAZ-812

[yaz-moved-to-github.git] / src / grs1disp.c

diff --git a/src/grs1disp.c b/src/grs1disp.c
index 892fdf5..429e9fe 100644 (file)
--- a/src/grs1disp.c
+++ b/src/grs1disp.c
@@ -1,17 +1,18 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
-
 /**
  * \file grs1disp.c
  * \brief Implements display of GRS-1 records
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <ctype.h>
 
 #include <yaz/proto.h>
 #include <yaz/oid_db.h>
@@ -22,13 +23,14 @@ static void display_variant(WRBUF w, Z_Variant *v, int level)
 
     for (i = 0; i < v->num_triples; i++)
     {
-        printf("%*sclass=" ODR_INT_PRINTF ",type=" ODR_INT_PRINTF,
-               level * 4, "", *v->triples[i]->zclass,
-               *v->triples[i]->type);
+        wrbuf_printf(w, "%*sclass=" ODR_INT_PRINTF ",type=" ODR_INT_PRINTF,
+                     level * 4, "", *v->triples[i]->zclass,
+                     *v->triples[i]->type);
         if (v->triples[i]->which == Z_Triple_internationalString)
-            printf(",value=%s\n", v->triples[i]->value.internationalString);
+            wrbuf_printf(w, ",value=%s\n",
+                         v->triples[i]->value.internationalString);
         else
-            printf("\n");
+            wrbuf_printf(w, "\n");
     }
 }
 
@@ -48,7 +50,7 @@ static void display_grs1(WRBUF w, Z_GenericRecord *r, int level)
         t = r->elements[i];
         wrbuf_printf(w, "(");
         if (t->tagType)
-            wrbuf_printf(w, ODR_INT_PRINTF, *t->tagType);
+            wrbuf_printf(w, ODR_INT_PRINTF ",", *t->tagType);
         else
             wrbuf_printf(w, "?,");
         if (t->tagValue->which == Z_StringOrNumeric_numeric)
@@ -82,9 +84,9 @@ static void display_grs1(WRBUF w, Z_GenericRecord *r, int level)
             {
                 char oid_name_str[OID_STR_MAX];
                 oid_class oclass;
-                const char *oid_name 
+                const char *oid_name
                     = yaz_oid_to_string_buf(ip, &oclass, oid_name_str);
-            
+
                 if (oid_name)
                     wrbuf_printf(w, "OID: %s\n", oid_name);
             }
@@ -101,7 +103,7 @@ static void display_grs1(WRBUF w, Z_GenericRecord *r, int level)
         {
             printf ("External\n");
             /* we cannot print externals here. Srry */
-        } 
+        }
         else
             wrbuf_printf(w, "? type = %d\n",t->content->which);
         if (t->appliedVariant)
@@ -122,7 +124,7 @@ static void display_grs1(WRBUF w, Z_GenericRecord *r, int level)
 
 void yaz_display_grs1(WRBUF wrbuf, Z_GenericRecord *r, int flags)
 {
-    display_grs1 (wrbuf, r, 0);
+    display_grs1(wrbuf, r, 0);
 }
 
 /*