X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Frecord_render.c;h=c48406c4c75d6d132c54a94fe791741068541f71;hb=bb1db6aa43a5f6c15dfa645ff15fecd463795cf6;hp=1c8c06a8570a496b4c56ab7edb3be096d45a9b3c;hpb=a87b8b80bdeff5308d2c21a9f1dc004573f18dad;p=yaz-moved-to-github.git

diff --git a/src/record_render.c b/src/record_render.c
index 1c8c06a..c48406c 100644
--- a/src/record_render.c
+++ b/src/record_render.c
@@ -34,7 +34,7 @@ static yaz_iconv_t iconv_create_charset(const char *record_charset,
     yaz_iconv_t cd = 0;
     char *from_set1 = 0;
     char *from_set2 = 0;
-    char *to_set = 0;
+    char *to_set = "utf-8";
     if (record_charset && *record_charset)
     {
         char *cp = charset_buf;
@@ -62,11 +62,11 @@ static yaz_iconv_t iconv_create_charset(const char *record_charset,
     }
     
     if (from_set1)
-        cd = yaz_iconv_open(to_set ? to_set : "UTF-8", from_set1);
+        cd = yaz_iconv_open(to_set, from_set1);
     if (cd2)
     {
         if (from_set2)
-            *cd2 = yaz_iconv_open(to_set ? to_set : "UTF-8", from_set2);
+            *cd2 = yaz_iconv_open(to_set, from_set2);
         else
             *cd2 = 0;
     }
@@ -465,7 +465,7 @@ const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
     if (base64_xpath)
     {
         char *type_spec = nmem_malloc(nmem,
-                                      strlen(format) + strlen(charset) + 11);
+                                      strlen(type) + strlen(charset) + 11);
         strcpy(type_spec, type);
         if (*charset)
         {