Attempt ISO2709 decoding of any octet aligned record

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

diff --git a/src/record_render.c b/src/record_render.c
index 37fc9f5..6acb1d7 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) 1995-2013 Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -38,10 +38,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,7 +60,7 @@ static yaz_iconv_t iconv_create_charset(const char *record_charset,
                 cp++;
         }
     }
-    
+
     if (from_set1)
         cd = yaz_iconv_open(to_set, from_set1);
     if (cd2)
@@ -115,7 +115,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)
@@ -167,19 +167,16 @@ static const char *return_record_wrbuf(WRBUF wrbuf, int *len,
                                     charset);
     else if (r->which == Z_External_octet)
     {
-        if (yaz_oid_is_iso2709(oid))
-        {
-            const char *ret_buf = return_marc_record(
-                wrbuf, marctype, len,
-                (const char *) r->u.octet_aligned->buf,
-                r->u.octet_aligned->len,
-                charset);
-            if (ret_buf)
-                return ret_buf;
-            /* bad ISO2709. Return fail unless raw (ISO2709) is wanted */
-            if (marctype != YAZ_MARC_ISO2709)
-                return 0;
-        }
+        const char *ret_buf = return_marc_record(
+            wrbuf, marctype, len,
+            (const char *) r->u.octet_aligned->buf,
+            r->u.octet_aligned->len,
+            charset);
+        if (ret_buf)
+            return ret_buf;
+        /* 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,
                                     (const char *) r->u.octet_aligned->buf,
                                     r->u.octet_aligned->len,
@@ -195,7 +192,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 +217,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 +375,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 +385,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 +398,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 +412,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;