From 27bd58d45e409b30bd043b114f91074fc8f324ab Mon Sep 17 00:00:00 2001 From: Mirko Tietgen <mirko@abunchofthings.net> Date: Sat, 6 Jul 2013 23:48:54 +0200 Subject: [PATCH] ILS-DI should not use ISO-8851-9 encoding This patch changes a few occurences of ISO-8859-1 to UTF-8 within the XML generation of the ILS-DI module. http://bugs.koha-community.org/show_bug.cgi?id=10549 Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> To test: - Activate ILS-DI system preference - Go to [youropac]/cgi-bin/koha/ilsdi.pl - Check all examples in the documentation for the correct encoding - Check GetAvailability gives you the correct encoding and check the source for the correct encoding Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> --- C4/ILSDI/Services.pm | 4 ++-- koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm index 68cbdb3..81a03fe 100644 --- a/C4/ILSDI/Services.pm +++ b/C4/ILSDI/Services.pm @@ -60,7 +60,7 @@ hashref that will be printed by XML::Simple in opac/ilsdi.pl noattr => 1, noescape => 1, nosort => 1, - xmldecl => '<?xml version="1.0" encoding="ISO-8859-1" ?>', + xmldecl => '<?xml version="1.0" encoding="UTF-8" ?>', RootName => 'LookupPatron', SuppressEmpty => 1); @@ -105,7 +105,7 @@ availability sub GetAvailability { my ($cgi) = @_; - my $out = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>\n"; + my $out = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"; $out .= "<dlf:collection\n"; $out .= " xmlns:dlf=\"http://diglib.org/ilsdi/1.1\"\n"; $out .= " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt index 9311599..bee032e 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt @@ -41,7 +41,7 @@ ilsdi.pl?service=GetAvailability&id=1+2+99999&id_type=item </a> <h4>Example response</h4> -<pre><?xml version="1.0" encoding="ISO-8859-1" ?> +<pre><?xml version="1.0" encoding="UTF-8" ?> <dlf:collection xmlns:dlf="http://diglib.org/ilsdi/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -114,7 +114,7 @@ ilsdi.pl?service=GetRecords&id=1+2+99999 </a> <h4>Example response</h4> -<pre><?xml version="1.0" encoding="ISO-8859-1" ?> +<pre><?xml version="1.0" encoding="UTF-8" ?> <GetRecords> <record> <biblioitemnumber>1</biblioitemnumber> @@ -376,7 +376,7 @@ ilsdi.pl?service=LookupPatron&id=815&id_type=cardnumber </a> <h4>Example response</h4> -<pre><?xml version="1.0" encoding="ISO-8859-1" ?> +<pre><?xml version="1.0" encoding="UTF-8" ?> <LookupPatron> <id>419</id> </LookupPatron></pre> @@ -397,7 +397,7 @@ ilsdi.pl?service=AuthenticatePatron&username=john9&password=soul </a> <h4>Example Response</h4> -<pre><?xml version="1.0" encoding="ISO-8859-1" ?> +<pre><?xml version="1.0" encoding="UTF-8" ?> <AuthenticatePatron> <id>419</id> </AuthenticatePatron></pre> @@ -427,7 +427,7 @@ ilsdi.pl?service=GetPatronInfo&patron_id=1&show_contact=0&show_loans=1 </a> <h4>Example response</h4> -<pre><?xml version="1.0" encoding="ISO-8859-1" ?> +<pre><?xml version="1.0" encoding="UTF-8" ?> <GetPatronInfo> <category_type>A</category_type> <categorycode>ADUEXT</categorycode> @@ -546,7 +546,7 @@ ilsdi.pl?service=GetPatronStatus&patron_id=1 </a> <h4>Example Response</h4> -<pre><?xml version="1.0" encoding="ISO-8859-1" ?> +<pre><?xml version="1.0" encoding="UTF-8" ?> <GetPatronStatus> <expiry>2010-03-04</expiry> <status>0</status> @@ -569,7 +569,7 @@ ilsdi.pl?service=GetServices&patron_id=1&item_id=1 </a> <h4>Example response</h4> -<pre><?xml version="1.0" encoding="ISO-8859-1" ?> +<pre><?xml version="1.0" encoding="UTF-8" ?> <GetServices> <AvailableFor>title level hold</AvailableFor> <AvailableFor>item level hold</AvailableFor> @@ -593,7 +593,7 @@ ilsdi.pl?service=RenewLoan&patron_id=1&item_id=1 </a> <h4>Example response</h4> -<pre><?xml version="1.0" encoding="ISO-8859-1" ?> +<pre><?xml version="1.0" encoding="UTF-8" ?> <RenewLoan> <success>0</success> <renewals>5</renewals> @@ -624,7 +624,7 @@ ilsdi.pl?service=HoldTitle&patron_id=1&bib_id=1&request_location=127.0.0.1 </a> <h4>Example response</h4> -<pre><?xml version="1.0" encoding="ISO-8859-1" ?> +<pre><?xml version="1.0" encoding="UTF-8" ?> <HoldTitle> <title>(les) galères de l'Orfèvre</title> <date_available>2009-05-11</date_available> @@ -655,7 +655,7 @@ ilsdi.pl?service=HoldItem&patron_id=1&bib_id=1&item_id=1 </a> <h4>Example response</h4> -<pre><?xml version="1.0" encoding="ISO-8859-1" ?> +<pre><?xml version="1.0" encoding="UTF-8" ?> <HoldTitle> <title>(les) galères de l'Orfèvre</title> <date_available>2009-05-11</date_available> @@ -678,7 +678,7 @@ ilsdi.pl?service=CancelHold&patron_id=1&item_id=1 </a> <h4>Example response</h4> -<pre><?xml version="1.0" encoding="ISO-8859-1" ?> +<pre><?xml version="1.0" encoding="UTF-8" ?> <CancelHold> <message>Canceled</message> </CancelHold></pre> -- 1.7.2.5