X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fzoom-c.c;h=ebedbde1c138482368c7c639b2ee7875130760df;hb=4e3f7be8266559e07dc01ae5d6aba31d30b8bd44;hp=fe7971dfe0889755cc7b26f2a5437c41e760337e;hpb=c92a1e74838a25214df478878806c7fb48167db5;p=yaz-moved-to-github.git

diff --git a/src/zoom-c.c b/src/zoom-c.c
index fe7971d..ebedbde 100644
--- a/src/zoom-c.c
+++ b/src/zoom-c.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2009 Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -2157,11 +2157,10 @@ ZOOM_API(const char *)
                                        charset);
         else if (r->which == Z_External_octet)
         {
-            int marc_decode_type = YAZ_MARC_MARCXML;
             if (yaz_oid_is_iso2709(oid))
             {
                 const char *ret_buf = marc_iconv_return(
-                    rec, marc_decode_type, len,
+                    rec, YAZ_MARC_MARCXML, len,
                     (const char *) r->u.octet_aligned->buf,
                     r->u.octet_aligned->len,
                     charset);
@@ -2183,16 +2182,30 @@ ZOOM_API(const char *)
     else if (!strcmp(type, "raw"))
     {
         Z_External *r = (Z_External *) npr->u.databaseRecord;
+        const Odr_oid *oid = r->direct_reference;
         
         if (r->which == Z_External_sutrs)
         {
-            if (len) *len = r->u.sutrs->len;
-            return (const char *) r->u.sutrs->buf;
+            return record_iconv_return(rec, len,
+                                       (const char *) r->u.sutrs->buf,
+                                       r->u.sutrs->len,
+                                       charset);
         }
         else if (r->which == Z_External_octet)
         {
-            if (len) *len = r->u.octet_aligned->len;
-            return (const char *) r->u.octet_aligned->buf;
+            if (yaz_oid_is_iso2709(oid) && *charset)
+            {
+                const char *ret_buf = marc_iconv_return(
+                    rec, YAZ_MARC_ISO2709, len,
+                    (const char *) r->u.octet_aligned->buf,
+                    r->u.octet_aligned->len,
+                    charset);
+                return ret_buf;
+            }
+            return record_iconv_return(rec, len,
+                                       (const char *) r->u.octet_aligned->buf,
+                                       r->u.octet_aligned->len,
+                                       charset);
         }
         else /* grs-1, explain, OPAC, ... */
         {
@@ -4680,6 +4693,7 @@ ZOOM_API(int) ZOOM_connection_get_timeout(ZOOM_connection c)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab