From 325d4af93c155ff068a4912ce0435b85fa276ec1 Mon Sep 17 00:00:00 2001 From: Mirko Tietgen Date: Sat, 6 Jul 2013 23:48:54 +0200 Subject: [PATCH] bug 10549: make the ILS-DI services advertise that they return UTF-8 This patch changes a few occurences of ISO-8859-1 to UTF-8 within the XML generation of the ILS-DI module. 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: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 2a1d0fc6d2d2674d4182ed1c6be557b568778834) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 795c8e9bd0fd2d6669582f12fdcaf3fe28acf553) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 795c8e9bd0fd2d6669582f12fdcaf3fe28acf553) --- 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 68cbdb3359..81a03fef28 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 => '', + xmldecl => '', RootName => 'LookupPatron', SuppressEmpty => 1); @@ -105,7 +105,7 @@ availability sub GetAvailability { my ($cgi) = @_; - my $out = "\n"; + my $out = "\n"; $out .= "

Example response

-
<?xml version="1.0" encoding="ISO-8859-1" ?>
+
<?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
                 
                 
Example response

-
<?xml version="1.0" encoding="ISO-8859-1" ?>
+
<?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
                 
                 
Example response

-
<?xml version="1.0" encoding="ISO-8859-1" ?>
+
<?xml version="1.0" encoding="UTF-8" ?>
 <LookupPatron>
   <id>419</id>
 </LookupPatron>

@@ -397,7 +397,7 @@
                     ilsdi.pl?service=AuthenticatePatron&username=john9&password=soul
                 
                 
Example Response

-
<?xml version="1.0" encoding="ISO-8859-1" ?>
+
<?xml version="1.0" encoding="UTF-8" ?>
 <AuthenticatePatron>
   <id>419</id>
 </AuthenticatePatron>

@@ -427,7 +427,7 @@
                     ilsdi.pl?service=GetPatronInfo&patron_id=1&show_contact=0&show_loans=1
                 
                 
Example response

-
<?xml version="1.0" encoding="ISO-8859-1" ?>
+
<?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
                 
                 
Example Response

-
<?xml version="1.0" encoding="ISO-8859-1" ?>
+
<?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
                 
                 
Example response

-
<?xml version="1.0" encoding="ISO-8859-1" ?>
+
<?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
                 
                 
Example response

-
<?xml version="1.0" encoding="ISO-8859-1" ?>
+
<?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
                 
                 
Example response

-
<?xml version="1.0" encoding="ISO-8859-1" ?>
+
<?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
                 
                 
Example response

-
<?xml version="1.0" encoding="ISO-8859-1" ?>
+
<?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
                 
                 
Example response

-
<?xml version="1.0" encoding="ISO-8859-1" ?>
+
<?xml version="1.0" encoding="UTF-8" ?>
 <CancelHold>
   <message>Canceled</message>
 </CancelHold>

-- 
2.39.5