Bugzilla – Attachment 13248 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]
Bug 8872: Changes for intranet showmarc
patch.txt (text/plain), 4.38 KB, created by
Marcel de Rooy
on 2012-11-05 11:07:09 UTC
(
hide
)
Description:
Bug 8872: Changes for intranet showmarc
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2012-11-05 11:07:09 UTC
Size:
4.38 KB
patch
obsolete
>From d15e7a3e03680adb280ead84acdd87be63ed5329 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 4 Oct 2012 13:34:51 +0200 >Subject: [PATCH] 8872 Changes for intranet showmarc >Content-Type: text/plain; charset="utf-8" > >Simplifies template (eliminating intranet-bottom include). >Makes encoding for card view more consistent with approach in Templates module. >Rearranges a few lines in script for consistency and performance. >--- > catalogue/showmarc.pl | 65 ++++++++------------ > .../prog/en/modules/catalogue/showmarc.tt | 4 +- > 2 files changed, 29 insertions(+), 40 deletions(-) > >diff --git a/catalogue/showmarc.pl b/catalogue/showmarc.pl >index 32ea2f6..1c453c4 100755 >--- a/catalogue/showmarc.pl >+++ b/catalogue/showmarc.pl >@@ -21,9 +21,7 @@ > # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > > use strict; >-#use warnings; FIXME - Bug 2505 >- >-use open OUT=>":encoding(UTF-8)", ':std'; >+use warnings; > > # standard or CPAN modules used > use CGI qw(:standard); >@@ -39,35 +37,23 @@ use C4::ImportBatch; > use XML::LibXSLT; > use XML::LibXML; > >-my $input = new CGI; >-my $biblionumber = $input->param('id'); >-my $importid = $input->param('importid'); >-my $view = $input->param('viewas'); >+my $input= new CGI; >+my $biblionumber= $input->param('id'); >+my $importid= $input->param('importid'); >+my $view= $input->param('viewas')||''; > >-my ( $template, $loggedinuser, $cookie ) = get_template_and_user( >- { >- template_name => "catalogue/showmarc.tmpl", >- query => $input, >- type => "intranet", >- authnotrequired => 0, >- flagsrequired => { catalogue => 1 }, >- debug => 1, >- } >-); >- >-$template->param( SCRIPT_NAME => $ENV{'SCRIPT_NAME'}, ); >-my ($record, $xmlrecord); >-if($importid) { >- my ($marc,$encoding) = GetImportRecordMarc($importid); >- $record = MARC::Record->new_from_usmarc($marc) ; >- if($view eq 'card') { >- $xmlrecord = $record->as_xml(); >- } >+my $record; >+if ($importid) { >+ my ($marc) = GetImportRecordMarc($importid); >+ $record = MARC::Record->new_from_usmarc($marc); >+} >+else { >+ $record =GetMarcBiblio($biblionumber); > } > > if($view eq 'card') { > my $themelang = '/' . C4::Context->preference("opacthemes") . '/' . C4::Templates::_current_language(); >- $xmlrecord = GetXmlBiblio($biblionumber) unless $xmlrecord; >+ my $xmlrecord= $importid? $record->as_xml(): GetXmlBiblio($biblionumber); > my $xslfile = > C4::Context->config('intrahtdocs') . $themelang . "/xslt/compact.xsl"; > my $parser = XML::LibXML->new(); >@@ -77,18 +63,19 @@ if($view eq 'card') { > 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) >- ; #decode only if not in perl internal format >- print $input->header( -charset => 'UTF-8' ), $newxmlrecord; >+ print $input->header(-charset => 'UTF-8'), Encode::encode_utf8($newxmlrecord); > } > else { >- $record =GetMarcBiblio($biblionumber) unless $record; >- >- my $formatted = $record->as_formatted; >- $template->param( MARC_FORMATTED => $formatted ); >- >- my $output= $template->output; >- $output=Encode::decode_utf8($output) unless utf8::is_utf8($output); >- output_html_with_http_headers $input, $cookie, $output; >+ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( >+ { >+ template_name => "catalogue/showmarc.tmpl", >+ query => $input, >+ type => "intranet", >+ authnotrequired => 0, >+ flagsrequired => { catalogue => 1 }, >+ debug => 1, >+ } >+ ); >+ $template->param( MARC_FORMATTED => $record->as_formatted ); >+ output_html_with_http_headers $input, $cookie, $template->output; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showmarc.tt >index 932a50a..a15fae3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showmarc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showmarc.tt >@@ -5,4 +5,6 @@ > <body id="catalog_showmarc" class="catalog"> > <div id="main"> > <pre>[% MARC_FORMATTED %] </pre> >-[% INCLUDE 'intranet-bottom.inc' %] >+</div> >+</body> >+</html> >-- >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