From aca2069302e0b91228a0ec083b18b1ce7ecd5ea1 Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Fri, 7 Nov 2014 18:44:04 +0100
Subject: [PATCH] Bug 13224: use TOUT-UF8 base for z3950 BNF server

For using z3950 BNF server with utf8 encoding, one must use "TOUT-UF8" base.
See http://www.bnf.fr/fr/professionnels/recuperation_donnees_bnf_boite_outils/a.profil_z3950_bnf.html

Test plan :
- create a fresh koha install : UNIMARC and fr-FR with optional z3950 servers
- go to cataloguing
- click on "New from Z39.50/SRU"
- Perform searches on BNF2
=> Check that encoding is correct
- Choose a record and import
=> Check that encoding is correct

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Trivial database field change, that reflects BnF recommended settings.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All instances have been changed. No problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 installer/data/mysql/fr-FR/2-Optionel/z3950_BNF.sql           | 4 +++-
 .../data/mysql/ru-RU/optional/z39-50servers_collection.sql    | 2 +-
 .../data/mysql/uk-UA/optional/z39-50servers_collection.sql    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/installer/data/mysql/fr-FR/2-Optionel/z3950_BNF.sql b/installer/data/mysql/fr-FR/2-Optionel/z3950_BNF.sql
index 2fd772d582..e4f3c8c47d 100644
--- a/installer/data/mysql/fr-FR/2-Optionel/z3950_BNF.sql
+++ b/installer/data/mysql/fr-FR/2-Optionel/z3950_BNF.sql
@@ -1 +1,3 @@
-INSERT INTO `z3950servers` (`host`, `port`, `db`, `userid`, `password`, `servername`, `id`, `checked`, `rank`, `syntax`, `servertype`) VALUES ('z3950.bnf.fr', 2211, 'TOUT', 'Z3950', 'Z3950_BNF', 'BNF2', 2, 1, 2, 'UNIMARC', 'zed');
+INSERT INTO `z3950servers`
+(`host`, `port`, `db`, `userid`, `password`, `servername`, `id`, `checked`, `rank`, `syntax`, `servertype`, `encoding`) VALUES
+('z3950.bnf.fr', 2211, 'TOUT-UTF8', 'Z3950', 'Z3950_BNF', 'BNF2', 2, 1, 2, 'UNIMARC', 'zed', 'utf8');
diff --git a/installer/data/mysql/ru-RU/optional/z39-50servers_collection.sql b/installer/data/mysql/ru-RU/optional/z39-50servers_collection.sql
index eb90f295f1..97de90c3d7 100644
--- a/installer/data/mysql/ru-RU/optional/z39-50servers_collection.sql
+++ b/installer/data/mysql/ru-RU/optional/z39-50servers_collection.sql
@@ -2,7 +2,7 @@ TRUNCATE z3950servers;
 
 INSERT INTO `z3950servers`
 (`host`, `port`, `db`, `userid`, `password`, `servername`, `id`, `checked`, `rank`, `syntax`, `servertype`, `encoding`) VALUES
-('z3950.bnf.fr', 2211, 'TOUT', 'Z3950', 'Z3950_BNF', 'BNF2', 2, 1, 1, 'UNIMARC', 'zed', 'utf8'),
+('z3950.bnf.fr', 2211, 'TOUT-UTF8', 'Z3950', 'Z3950_BNF', 'BNF2', 2, 1, 1, 'UNIMARC', 'zed', 'utf8'),
 ('62.76.8.149', 210, 'books', '', '', 'НАУЧНАЯ БИБЛИОТЕКА БАШКИРСКОГО ГОСУДАРСТВЕННОГО УНИВЕРСИТЕТА', 3, 1, 1, 'UNIMARC', 'zed', 'utf8'),
 ('81.30.205.34', 210, 'books', '', '', 'НАЦИОНАЛЬНАЯ БИБЛИОТЕКА ИМ. АХМЕТ-ЗАКИ ВАЛИДИ (БД BOOKS)', 4, 1, 1, 'UNIMARC', 'zed', 'utf8'),
 ('libor.pstu.ru', 210, 'books', '', '', 'ПЕРМСКИЙ ГОСУДАРСТВЕННЫЙ ТЕХНИЧЕСКИЙ УНИВЕРСИТЕТ (БД BOOKS)', 5, 1, 1, 'UNIMARC', 'zed', 'utf8'),
diff --git a/installer/data/mysql/uk-UA/optional/z39-50servers_collection.sql b/installer/data/mysql/uk-UA/optional/z39-50servers_collection.sql
index eb90f295f1..97de90c3d7 100644
--- a/installer/data/mysql/uk-UA/optional/z39-50servers_collection.sql
+++ b/installer/data/mysql/uk-UA/optional/z39-50servers_collection.sql
@@ -2,7 +2,7 @@ TRUNCATE z3950servers;
 
 INSERT INTO `z3950servers`
 (`host`, `port`, `db`, `userid`, `password`, `servername`, `id`, `checked`, `rank`, `syntax`, `servertype`, `encoding`) VALUES
-('z3950.bnf.fr', 2211, 'TOUT', 'Z3950', 'Z3950_BNF', 'BNF2', 2, 1, 1, 'UNIMARC', 'zed', 'utf8'),
+('z3950.bnf.fr', 2211, 'TOUT-UTF8', 'Z3950', 'Z3950_BNF', 'BNF2', 2, 1, 1, 'UNIMARC', 'zed', 'utf8'),
 ('62.76.8.149', 210, 'books', '', '', 'НАУЧНАЯ БИБЛИОТЕКА БАШКИРСКОГО ГОСУДАРСТВЕННОГО УНИВЕРСИТЕТА', 3, 1, 1, 'UNIMARC', 'zed', 'utf8'),
 ('81.30.205.34', 210, 'books', '', '', 'НАЦИОНАЛЬНАЯ БИБЛИОТЕКА ИМ. АХМЕТ-ЗАКИ ВАЛИДИ (БД BOOKS)', 4, 1, 1, 'UNIMARC', 'zed', 'utf8'),
 ('libor.pstu.ru', 210, 'books', '', '', 'ПЕРМСКИЙ ГОСУДАРСТВЕННЫЙ ТЕХНИЧЕСКИЙ УНИВЕРСИТЕТ (БД BOOKS)', 5, 1, 1, 'UNIMARC', 'zed', 'utf8'),
-- 
2.39.2