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&amp;id=1+2+99999&amp;id_type=item
                 </a>
                 <h4>Example response</h4>
-<pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
+<pre>&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
 &lt;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&amp;id=1+2+99999
                 </a>
                 <h4>Example response</h4>
-<pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
+<pre>&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
 &lt;GetRecords&gt;
   &lt;record&gt;
     &lt;biblioitemnumber&gt;1&lt;/biblioitemnumber&gt;
@@ -376,7 +376,7 @@
                     ilsdi.pl?service=LookupPatron&amp;id=815&amp;id_type=cardnumber
                 </a>
                 <h4>Example response</h4>
-<pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
+<pre>&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
 &lt;LookupPatron&gt;
   &lt;id&gt;419&lt;/id&gt;
 &lt;/LookupPatron&gt;</pre>
@@ -397,7 +397,7 @@
                     ilsdi.pl?service=AuthenticatePatron&amp;username=john9&amp;password=soul
                 </a>
                 <h4>Example Response</h4>
-<pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
+<pre>&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
 &lt;AuthenticatePatron&gt;
   &lt;id&gt;419&lt;/id&gt;
 &lt;/AuthenticatePatron&gt;</pre>
@@ -427,7 +427,7 @@
                     ilsdi.pl?service=GetPatronInfo&amp;patron_id=1&amp;show_contact=0&amp;show_loans=1
                 </a>
                 <h4>Example response</h4>
-<pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
+<pre>&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
 &lt;GetPatronInfo&gt;
   &lt;category_type&gt;A&lt;/category_type&gt;
   &lt;categorycode&gt;ADUEXT&lt;/categorycode&gt;
@@ -546,7 +546,7 @@
                     ilsdi.pl?service=GetPatronStatus&amp;patron_id=1
                 </a>
                 <h4>Example Response</h4>
-<pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
+<pre>&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
 &lt;GetPatronStatus&gt;
   &lt;expiry&gt;2010-03-04&lt;/expiry&gt;
   &lt;status&gt;0&lt;/status&gt;
@@ -569,7 +569,7 @@
                     ilsdi.pl?service=GetServices&amp;patron_id=1&amp;item_id=1
                 </a>
                 <h4>Example response</h4>
-<pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
+<pre>&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
 &lt;GetServices&gt;
   &lt;AvailableFor&gt;title level hold&lt;/AvailableFor&gt;
   &lt;AvailableFor&gt;item level hold&lt;/AvailableFor&gt;
@@ -593,7 +593,7 @@
                     ilsdi.pl?service=RenewLoan&amp;patron_id=1&amp;item_id=1
                 </a>
                 <h4>Example response</h4>
-<pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
+<pre>&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
 &lt;RenewLoan&gt;
   &lt;success&gt;0&lt;/success&gt;
   &lt;renewals&gt;5&lt;/renewals&gt;
@@ -624,7 +624,7 @@
                     ilsdi.pl?service=HoldTitle&amp;patron_id=1&amp;bib_id=1&amp;request_location=127.0.0.1
                 </a>
                 <h4>Example response</h4>
-<pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
+<pre>&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
 &lt;HoldTitle&gt;
   &lt;title&gt;(les) galères de l'Orfèvre&lt;/title&gt;
   &lt;date_available&gt;2009-05-11&lt;/date_available&gt;
@@ -655,7 +655,7 @@
                     ilsdi.pl?service=HoldItem&amp;patron_id=1&amp;bib_id=1&amp;item_id=1
                 </a>
                 <h4>Example response</h4>
-<pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
+<pre>&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
 &lt;HoldTitle&gt;
   &lt;title&gt;(les) galères de l'Orfèvre&lt;/title&gt;
   &lt;date_available&gt;2009-05-11&lt;/date_available&gt;
@@ -678,7 +678,7 @@
                     ilsdi.pl?service=CancelHold&amp;patron_id=1&amp;item_id=1
                 </a>
                 <h4>Example response</h4>
-<pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
+<pre>&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
 &lt;CancelHold&gt;
   &lt;message&gt;Canceled&lt;/message&gt;
 &lt;/CancelHold&gt;</pre>
-- 
1.7.2.5