From 9306ee98c79d66dd9f7ca38f2e453085f3fd4416 Mon Sep 17 00:00:00 2001 From: Magnus Enger Date: Wed, 13 Feb 2013 13:43:22 +0100 Subject: [PATCH] Bug 9498 - Update encoding for Norwegian sample Z39.50 servers This patch - Updates the sample servers installed by the web installer - Does a database upgrade that changes the encoding for the servers in question To test: - Do a Norwegian installation and make sure to choose the optional sample Z39.50 targets - Check that encodings for the Norwegian targets (BIBSYS, SAMBOK, NORBOK and DEICHMAN) are all set to ISO_6937 (which is the wrong encoding) - Apply this patch and make sure updatadatabase.pl is run - Check that the encoding for the four targets mentioned above are now ISO_8859-1 - Do one search against each target and check that there are no "strange" chars in the result list. Searching each of the targets for "hessen" should give results that include "norwegian vowels" - Log on to the MySQL of the test installation and empty the table of Z39.50 targets: mysql> delete from z3950servers; - Load this file into MySQL from the command line: installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql and check that it loads without errors and that the four Norwegian targets are still set to have encoding = ISO_8859-1 Signed-off-by: Bernardo Gonzalez Kriegel Comment: Work as described. No errors. No koha-qa errors Passed-QA-by: Marcel de Rooy Signed-off-by: Jared Camins-Esakov Conflicts: installer/data/mysql/updatedatabase.pl Signed-off-by: Chris Cormack --- .../data/mysql/nb-NO/2-Valgfritt/z3950servers.sql | 8 ++++---- installer/data/mysql/updatedatabase.pl | 12 +++++++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql b/installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql index 7bba81bdea..b1af0f3f8e 100644 --- a/installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql +++ b/installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql @@ -1,6 +1,6 @@ INSERT INTO z3950servers (host, port, db, userid, password, name, id, checked, rank, syntax, timeout, icon, position, type, encoding, description) VALUES ('lx2.loc.gov',210,'LCDB','','','LIBRARY OF CONGRESS',1,0,0,'USMARC',0,NULL,'primary','zed','utf8',''), -('z3950.bibsys.no',2100,'BIBSYS','','','BIBSYS',12,1,1,'NORMARC',0,NULL,'primary','zed','ISO_6937',''), -('z3950.nb.no',2100,'Norbok','','','NORBOK',13,0,0,'NORMARC',0,NULL,'primary','zed','ISO_6937',''), -('z3950.nb.no',2100,'Sambok','','','SAMBOK',14,0,0,'NORMARC',0,NULL,'primary','zed','ISO_6937',''), -('z3950.deich.folkebibl.no',210,'data','','','DEICHMAN',15,0,0,'NORMARC',0,NULL,'primary','zed','ISO_6937',''); +('z3950.bibsys.no',2100,'BIBSYS','','','BIBSYS',12,1,1,'NORMARC',0,NULL,'primary','zed','ISO_8859-1',''), +('z3950.nb.no',2100,'Norbok','','','NORBOK',13,0,0,'NORMARC',0,NULL,'primary','zed','ISO_8859-1',''), +('z3950.nb.no',2100,'Sambok','','','SAMBOK',14,0,0,'NORMARC',0,NULL,'primary','zed','ISO_8859-1',''), +('z3950.deich.folkebibl.no',210,'data','','','DEICHMAN',15,0,0,'NORMARC',0,NULL,'primary','zed','ISO_8859-1',''); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 4aac6674b4..5c6ad2cf61 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -6182,7 +6182,7 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { } $DBversion = '3.10.04.002'; -if ( CheckVersion($DBversion) ) { +if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { my $sth = $dbh->prepare(" SELECT module, code, branchcode, content FROM letter @@ -6198,6 +6198,16 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } +$DBversion = "3.10.04.003"; +if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { + $dbh->do("UPDATE z3950servers SET encoding = 'ISO_8859-1' WHERE name = 'BIBSYS'"); + $dbh->do("UPDATE z3950servers SET encoding = 'ISO_8859-1' WHERE name = 'NORBOK'"); + $dbh->do("UPDATE z3950servers SET encoding = 'ISO_8859-1' WHERE name = 'SAMBOK'"); + $dbh->do("UPDATE z3950servers SET encoding = 'ISO_8859-1' WHERE name = 'DEICHMAN'"); + print "Upgrade to $DBversion done (Bug 9498 - Update encoding for Norwegian sample Z39.50 servers)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) -- 2.39.5