X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_record_transform.cpp;h=c872e76f18cd66d6db48c7338c48e9e0dba985be;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=a6e3163452977a1807fd99e84413423737a14e4e;hpb=73f37c91c144b070020df2f27472c09b62367acf;p=metaproxy-moved-to-github.git

diff --git a/src/filter_record_transform.cpp b/src/filter_record_transform.cpp
index a6e3163..c872e76 100644
--- a/src/filter_record_transform.cpp
+++ b/src/filter_record_transform.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2012 Index Data
+   Copyright (C) Index Data
 
 Metaproxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/diagbib1.h>
 #include <yaz/zgdu.h>
 #include <yaz/retrieval.h>
+#include <yaz/oid_db.h>
 
 #include <boost/thread/mutex.hpp>
 
@@ -461,14 +462,16 @@ void yf::RecordTransform::Impl::process(mp::Package &package) const
             Z_NamePlusRecord *npr = records->records[i];
             if (npr->which == Z_NamePlusRecord_databaseRecord)
             {
+                const char *details = 0;
                 mp::wrbuf output_record;
                 Z_External *r = npr->u.databaseRecord;
-                int ret_trans = 0;
+                int ret_trans = -1;
                 if (r->which == Z_External_OPAC)
                 {
                     ret_trans =
                         yaz_record_conv_opac_record(rc, r->u.opac,
                                                     output_record);
+                    details = yaz_record_conv_get_error(rc);
                 }
                 else if (r->which == Z_External_octet)
                 {
@@ -477,21 +480,53 @@ void yf::RecordTransform::Impl::process(mp::Package &package) const
                                                r->u.octet_aligned->buf,
                                                r->u.octet_aligned->len,
                                                output_record);
+                    details = yaz_record_conv_get_error(rc);
                 }
-                if (ret_trans == 0)
+                else
                 {
-                    npr->u.databaseRecord =
-                        z_ext_record_oid(odr_en, match_syntax,
-                                         output_record.buf(),
-                                         output_record.len());
+                    details = "unsupported record type for record_conv";
                 }
-                else
+                if (ret_trans)
                 {
                     records->records[i] =
                         zget_surrogateDiagRec(
                             odr_en, npr->databaseName,
                             YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS,
-                            yaz_record_conv_get_error(rc));
+                            details);
+                }
+                else
+                {
+                    if (!oid_oidcmp(match_syntax, yaz_oid_recsyn_opac))
+                    {
+                        yaz_marc_t mt = yaz_marc_create();
+                        Z_OPACRecord *opac = 0;
+                        if (yaz_xml_to_opac(mt, output_record.buf(),
+                                            output_record.len(),
+                                            &opac, 0 /* iconv */,
+                                            ((ODR )odr_en)->mem, 0)
+                            && opac)
+                        {
+                            npr->u.databaseRecord =
+                                z_ext_record_oid(odr_en, match_syntax,
+                                                 (const char *) opac, -1);
+                        }
+                        else
+                        {
+                            records->records[i] =
+                                zget_surrogateDiagRec(
+                                    odr_en, npr->databaseName,
+                                    YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS,
+                                    "XML to OPAC conversion failed");
+                        }
+                        yaz_marc_destroy(mt);
+                    }
+                    else
+                    {
+                        npr->u.databaseRecord =
+                            z_ext_record_oid(odr_en, match_syntax,
+                                             output_record.buf(),
+                                             output_record.len());
+                    }
                 }
             }
         }