[Koha-patches] [PATCH 2/2] Bug 5106 Followup

[Frédéric Demians]

- UTF8 encoding issue, UTF8 characters were not displayed properly
- UNIMARC XSL as the MARC21 doesn't show anymore 2 links to MARC view

Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
---
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl        |    3 +--
 opac/opac-showmarc.pl                              |    1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
index 725c559..327c58d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
@@ -57,10 +57,9 @@
       <span id="Normalview">Normal View</span>
     </span>
     <span class="view">
-      <a id="MARCviewPop" href="/cgi-bin/koha/opac-showmarc.pl?id={marc:datafield[@tag=090]/marc:subfield[@code='a']}" title="MARC" rel="gb_page_center[600,500]">MARC View</a>
     </span>
     <span class="view">
-      <a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber={marc:datafield[@tag=090]/marc:subfield[@code='a']}" title="MARC">Expanded MARC View</a>
+      <a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber={marc:datafield[@tag=090]/marc:subfield[@code='a']}" title="MARC">MARC View</a>
     </span>
     <span class="view">
       <a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber={marc:datafield[@tag=090]/marc:subfield[@code='a']}">Card View (ISBD)</a>
diff --git a/opac/opac-showmarc.pl b/opac/opac-showmarc.pl
index 9c70d56..4bfbd1b 100755
--- a/opac/opac-showmarc.pl
+++ b/opac/opac-showmarc.pl
@@ -85,6 +85,7 @@ if ($view eq 'card') {
     my $stylesheet = $xslt->parse_stylesheet($style_doc);
     my $results = $stylesheet->transform($source);
     my $newxmlrecord = $stylesheet->output_string($results);
+    utf8::decode($newxmlrecord);
     #warn $newxmlrecord;
     print $input->header(), $newxmlrecord;
     exit;
-- 
1.7.3.2