Simple refactor due to yaz_match_xsd_element 0 check YAZ-822

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

diff --git a/src/record_render.c b/src/record_render.c
index 37fc9f5..82fa698 100644 (file)
--- a/src/record_render.c
+++ b/src/record_render.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -28,7 +28,9 @@
 #endif
 
 static yaz_iconv_t iconv_create_charset(const char *record_charset,
-                                        yaz_iconv_t *cd2)
+                                        yaz_iconv_t *cd2,
+                                        const char *marc_buf,
+                                        int sz)
 {
     char charset_buf[40];
     yaz_iconv_t cd = 0;
@@ -38,10 +40,10 @@ static yaz_iconv_t iconv_create_charset(const char *record_charset,
     if (record_charset && *record_charset)
     {
         char *cp = charset_buf;
-        
+
         strncpy(charset_buf, record_charset, sizeof(charset_buf)-1);
         charset_buf[sizeof(charset_buf)-1] = '\0';
-        
+
         from_set1 = cp;
         while (*cp && *cp != ',' && *cp != '/')
             cp++;
@@ -60,9 +62,13 @@ static yaz_iconv_t iconv_create_charset(const char *record_charset,
                 cp++;
         }
     }
-    
+
     if (from_set1)
+    {
+        if (yaz_marc_check_marc21_coding(from_set1, marc_buf, sz))
+            from_set1 = "utf-8";
         cd = yaz_iconv_open(to_set, from_set1);
+    }
     if (cd2)
     {
         if (from_set2)
@@ -79,7 +85,7 @@ static const char *return_marc_record(WRBUF wrbuf,
                                       const char *buf, int sz,
                                       const char *record_charset)
 {
-    yaz_iconv_t cd = iconv_create_charset(record_charset, 0);
+    yaz_iconv_t cd = iconv_create_charset(record_charset, 0, buf, sz);
     yaz_marc_t mt = yaz_marc_create();
     const char *ret_string = 0;
 
@@ -103,10 +109,22 @@ static const char *return_opac_record(WRBUF wrbuf,
                                       Z_OPACRecord *opac_rec,
                                       const char *record_charset)
 {
-    yaz_iconv_t cd2;
-    yaz_iconv_t cd = iconv_create_charset(record_charset, &cd2);
+    yaz_iconv_t cd, cd2;
+    const char *marc_buf = 0;
+    int marc_sz = 0;
     yaz_marc_t mt = yaz_marc_create();
 
+    if (opac_rec->bibliographicRecord)
+    {
+        Z_External *ext = opac_rec->bibliographicRecord;
+        if (ext->which == Z_External_octet)
+        {
+            marc_buf = (const char *) ext->u.octet_aligned->buf;
+            marc_sz = ext->u.octet_aligned->len;
+        }
+    }
+    cd = iconv_create_charset(record_charset, &cd2, marc_buf, marc_sz);
+
     if (cd)
         yaz_marc_iconv(mt, cd);
     yaz_marc_xml(mt, marc_type);
@@ -115,7 +133,7 @@ static const char *return_opac_record(WRBUF wrbuf,
         yaz_opac_decode_wrbuf2(mt, opac_rec, wrbuf, cd2);
     else
         yaz_opac_decode_wrbuf(mt, opac_rec, wrbuf);
-        
+
     yaz_marc_destroy(mt);
 
     if (cd)
@@ -131,7 +149,7 @@ static const char *return_string_record(WRBUF wrbuf,
                                         const char *buf, int sz,
                                         const char *record_charset)
 {
-    yaz_iconv_t cd = iconv_create_charset(record_charset, 0);
+    yaz_iconv_t cd = iconv_create_charset(record_charset, 0, 0, 0);
 
     if (cd)
     {
@@ -167,7 +185,10 @@ static const char *return_record_wrbuf(WRBUF wrbuf, int *len,
                                     charset);
     else if (r->which == Z_External_octet)
     {
-        if (yaz_oid_is_iso2709(oid))
+        if (oid_oidcmp(oid, yaz_oid_recsyn_xml)
+            && oid_oidcmp(oid, yaz_oid_recsyn_application_xml)
+            && oid_oidcmp(oid, yaz_oid_recsyn_mab)
+            && oid_oidcmp(oid, yaz_oid_recsyn_html))
         {
             const char *ret_buf = return_marc_record(
                 wrbuf, marctype, len,
@@ -176,8 +197,8 @@ static const char *return_record_wrbuf(WRBUF wrbuf, int *len,
                 charset);
             if (ret_buf)
                 return ret_buf;
-            /* bad ISO2709. Return fail unless raw (ISO2709) is wanted */
-            if (marctype != YAZ_MARC_ISO2709)
+            /* not ISO2709. Return fail unless raw (ISO2709) is wanted */
+            if (yaz_oid_is_iso2709(oid) && marctype != YAZ_MARC_ISO2709)
                 return 0;
         }
         return return_string_record(wrbuf, len,
@@ -195,7 +216,7 @@ static const char *return_record_wrbuf(WRBUF wrbuf, int *len,
     }
     return 0;
 }
-    
+
 static const char *get_record_format(WRBUF wrbuf, int *len,
                                      Z_NamePlusRecord *npr,
                                      int marctype, const char *charset,
@@ -220,7 +241,7 @@ static const char *get_record_format(WRBUF wrbuf, int *len,
             xmlFreeDoc(doc);
             res = wrbuf_cstr(wrbuf);
             *len = wrbuf_len(wrbuf);
-        } 
+        }
     }
 #endif
     return res;
@@ -378,7 +399,7 @@ const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
         }
         else if (!strncmp(cp + i, "format=", 7))
         {
-            size_t j = 0; 
+            size_t j = 0;
             i = i + 7;
             while (cp[i] == ' ')
                 i++;
@@ -388,7 +409,7 @@ const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
                     format[j++] = cp[i];
             }
             format[j] = '\0';
-        } 
+        }
         else if (!strncmp(cp + i, "base64=", 7))
         {
             size_t i0;
@@ -401,7 +422,7 @@ const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
 
             nmem = nmem_create();
             base64_xpath = nmem_strdupn(nmem, cp + i0, i - i0);
-        } 
+        }
     }
     if (!strcmp(type, "database"))
     {
@@ -415,7 +436,7 @@ const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
     }
     else if (!strcmp(type, "syntax"))
     {
-        const char *desc = 0;   
+        const char *desc = 0;
         if (npr->which == Z_NamePlusRecord_databaseRecord)
         {
             Z_External *r = (Z_External *) npr->u.databaseRecord;
@@ -442,6 +463,11 @@ const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
         ret = get_record_format(wrbuf, len, npr, YAZ_MARC_TURBOMARC, charset,
                                 format);
     }
+    else if (!strcmp(type, "json"))
+    {
+        ret = get_record_format(wrbuf, len, npr, YAZ_MARC_JSON, charset,
+                                format);
+    }
     else if (!strcmp(type, "raw"))
     {
         ret = get_record_format(wrbuf, len, npr, YAZ_MARC_ISO2709, charset,