From 3f2b5d270c5a2f6f2d267ca1b602e479a4855b08 Mon Sep 17 00:00:00 2001 From: Magnus Enger Date: Sun, 27 Jan 2013 14:00:45 +0100 Subject: [PATCH] Bug 9497 - Make it easier to add new encodings for Z39.50 servers and add ISO 8859-1 This patch does three things: - Makes admin/z3950servers.pl create one variable for encoding, not one variable for each encoding - Makes the template create encoding options from a list - Adds ISO 8859-1 to the list of available encodings See the bug for a lengthier description To test: - Apply the patch - Edit one Z39.50 server several times, choosing each available encoding in turn - Check that for each encoding, the correct encoding is shown both in the list of Z39.50 servers and in the dropdown on the edit screen Comment: Works as described, no errors. Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Mason James Signed-off-by: Jared Camins-Esakov --- admin/z3950servers.pl | 4 +-- .../prog/en/modules/admin/z3950servers.tt | 30 ++++--------------- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl index fc9e2ed192..92cc3e59f6 100755 --- a/admin/z3950servers.pl +++ b/admin/z3950servers.pl @@ -97,9 +97,9 @@ if ($op eq 'add_form') { $sth->finish; } $template->param( $_ => $data->{$_} ) - for ( qw( host port db userid password checked rank timeout ) ); + for ( qw( host port db userid password checked rank timeout encoding ) ); $template->param( $_ . $data->{$_} => 1) - for ( qw( syntax encoding ) ); + for ( qw( syntax ) ); # END $OP eq ADD_FORM ################## ADD_VALIDATE ################################## # called by add_form, used to insert/modify data in DB diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt index 3205e6f6ba..a2f473d243 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -203,30 +203,12 @@
    • -- 2.39.5