Bugzilla – Attachment 12758 Details for
Bug 8872
Improve encoding for xslt files, showmarc and opac-showmarc
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch 4 for opac-showmarc
patch.txt (text/plain), 3.90 KB, created by
Marcel de Rooy
on 2012-10-10 13:59:03 UTC
(
hide
)
Description:
Patch 4 for opac-showmarc
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2012-10-10 13:59:03 UTC
Size:
3.90 KB
patch
obsolete
>From 4ac469af74c6b84811822a841bdebfa96b858755 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 4 Oct 2012 13:40:51 +0200 >Subject: [PATCH] 8872 Changes for opac-showmarc >Content-Type: text/plain; charset="utf-8" > >Simplifies template (eliminating opac-bottom include). >Makes encoding for card and html view more consistent with approach in Templates module. >Rearranges a few lines in script for consistency and performance. >--- > .../opac-tmpl/prog/en/modules/opac-showmarc.tt | 8 ++- > opac/opac-showmarc.pl | 43 +++++++++----------- > 2 files changed, 24 insertions(+), 27 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt >index 3a5a9f8..452d565 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt >@@ -1,8 +1,10 @@ >-[% INCLUDE 'doc-head-open.inc' %]MARC view >+[% INCLUDE 'doc-head-open.inc' %] >+MARC view</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > </head> > <body id="opac-showmarc"> > <div id="main"> > <pre>[% MARC_FORMATTED %]</pre> >-<!-- div gets closed by opac-bottom.inc --> >-[% INCLUDE 'opac-bottom.inc' %] >+</div> >+</body> >+</html> >diff --git a/opac/opac-showmarc.pl b/opac/opac-showmarc.pl >index 3638f88..d562ae5 100755 >--- a/opac/opac-showmarc.pl >+++ b/opac/opac-showmarc.pl >@@ -27,8 +27,6 @@ > use strict; > use warnings; > >-use open OUT=> ":encoding(UTF-8)", ':std'; >- > # standard or CPAN modules used > use CGI; > use Encode; >@@ -44,29 +42,20 @@ use XML::LibXML; > > my $input = new CGI; > my $biblionumber = $input->param('id'); >-my $importid = $input->param('importid'); >-my $view = $input->param('viewas') || 'marc'; >- >-my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ >- template_name => "opac-showmarc.tmpl", >- query => $input, >- type => "opac", >- authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), >- debug => 1, >-}); >+my $importid= $input->param('importid'); >+my $view= $input->param('viewas') || 'marc'; > >-$template->param( SCRIPT_NAME => $ENV{'SCRIPT_NAME'}, ); >-my ($record, $xmlrecord); >+my $record; > if ($importid) { >- my ($marc,$encoding) = GetImportRecordMarc($importid); >- $record = MARC::Record->new_from_usmarc($marc) ; >- if($view eq 'card') { >- $xmlrecord = $record->as_xml(); >- } >+ my ($marc) = GetImportRecordMarc($importid); >+ $record = MARC::Record->new_from_usmarc($marc); >+} >+else { >+ $record =GetMarcBiblio($biblionumber); > } > > if ($view eq 'card' || $view eq 'html') { >- $xmlrecord = GetXmlBiblio($biblionumber) unless $xmlrecord; >+ my $xmlrecord= $importid? $record->as_xml(): GetXmlBiblio($biblionumber); > my $xslfile; > my $themelang = '/' . C4::Context->preference("opacthemes") . '/' . C4::Templates::_current_language(); > >@@ -83,10 +72,16 @@ if ($view eq 'card' || $view eq 'html') { > my $stylesheet = $xslt->parse_stylesheet($style_doc); > my $results = $stylesheet->transform($source); > my $newxmlrecord = $stylesheet->output_string($results); >- $newxmlrecord = Encode::decode_utf8($newxmlrecord) unless utf8::is_utf8($newxmlrecord); >- print $input->header(-charset => 'UTF-8'), $newxmlrecord; >-} else { >- $record =GetMarcBiblio($biblionumber) unless $record; >+ print $input->header(-charset => 'UTF-8'), Encode::encode_utf8($newxmlrecord); >+} >+else { #view eq marc >+ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ >+ template_name => "opac-showmarc.tmpl", >+ query => $input, >+ type => "opac", >+ authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), >+ debug => 1, >+ }); > $template->param( MARC_FORMATTED => $record->as_formatted ); > output_html_with_http_headers $input, $cookie, $template->output; > } >-- >1.7.7.6 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8872
:
12755
|
12756
|
12757
|
12758
|
12759
|
12986
|
12987
|
12988
|
12989
|
12990
|
13171
|
13172
|
13173
|
13244
|
13245
|
13248