From eb4cb953ec3e4e48cec23c362ad29e6596854586 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 28 Aug 2014 15:17:34 +0200 Subject: [PATCH] Bug 6536: Follow-up: Updating installer sql files for z3950servers (Part 2) This patch renames name to servername and type to servertype. Signed-off-by: Marcel de Rooy Tested all sql files by script. Signed-off-by: Tomas Cohen Arazi --- installer/data/mysql/de-DE/optional/sample_z3950_servers.sql | 2 +- installer/data/mysql/en/optional/sample_z3950_servers.sql | 2 +- installer/data/mysql/es-ES/optional/sample_z3950_servers.sql | 2 +- installer/data/mysql/fr-FR/2-Optionel/z3950_BNF.sql | 2 +- installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql | 2 +- installer/data/mysql/pl-PL/optional/sample_z3950_servers.sql | 2 +- .../data/mysql/ru-RU/optional/z39-50servers_collection.sql | 4 ++-- .../data/mysql/uk-UA/optional/z39-50servers_collection.sql | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/installer/data/mysql/de-DE/optional/sample_z3950_servers.sql b/installer/data/mysql/de-DE/optional/sample_z3950_servers.sql index 68e28a04f7..57c6481c61 100644 --- a/installer/data/mysql/de-DE/optional/sample_z3950_servers.sql +++ b/installer/data/mysql/de-DE/optional/sample_z3950_servers.sql @@ -1,5 +1,5 @@ INSERT INTO z3950servers -(host, port, db, userid, password, name, checked, rank, syntax, encoding,recordtype) VALUES +(host, port, db, userid, password, servername, checked, rank, syntax, encoding,recordtype) VALUES ('lx2.loc.gov',210,'LCDB','','','LIBRARY OF CONGRESS',1,1,'USMARC','utf8','biblio'), ('lx2.loc.gov',210,'NAF','','','LIBRARY OF CONGRESS NAMES',1,1,'USMARC','utf8','authority'), ('lx2.loc.gov',210,'SAF','','','LIBRARY OF CONGRESS SUBJECTS',1,2,'USMARC','utf8','authority'), diff --git a/installer/data/mysql/en/optional/sample_z3950_servers.sql b/installer/data/mysql/en/optional/sample_z3950_servers.sql index 68e28a04f7..57c6481c61 100644 --- a/installer/data/mysql/en/optional/sample_z3950_servers.sql +++ b/installer/data/mysql/en/optional/sample_z3950_servers.sql @@ -1,5 +1,5 @@ INSERT INTO z3950servers -(host, port, db, userid, password, name, checked, rank, syntax, encoding,recordtype) VALUES +(host, port, db, userid, password, servername, checked, rank, syntax, encoding,recordtype) VALUES ('lx2.loc.gov',210,'LCDB','','','LIBRARY OF CONGRESS',1,1,'USMARC','utf8','biblio'), ('lx2.loc.gov',210,'NAF','','','LIBRARY OF CONGRESS NAMES',1,1,'USMARC','utf8','authority'), ('lx2.loc.gov',210,'SAF','','','LIBRARY OF CONGRESS SUBJECTS',1,2,'USMARC','utf8','authority'), diff --git a/installer/data/mysql/es-ES/optional/sample_z3950_servers.sql b/installer/data/mysql/es-ES/optional/sample_z3950_servers.sql index 472d8eb0b1..aed01b2c22 100644 --- a/installer/data/mysql/es-ES/optional/sample_z3950_servers.sql +++ b/installer/data/mysql/es-ES/optional/sample_z3950_servers.sql @@ -1,5 +1,5 @@ INSERT INTO `z3950servers` -(`host`, `port`, `db`, `userid`, `password`, `name`, `id`, `checked`, `rank`, `syntax`, `encoding`) VALUES +(`host`, `port`, `db`, `userid`, `password`, `servername`, `id`, `checked`, `rank`, `syntax`, `encoding`) VALUES ('lx2.loc.gov',210,'LCDB','','','LIBRARY OF CONGRESS',1,1,1,'USMARC','utf8'), ('clio-db.cc.columbia.edu',7090,'voyager','','','COLUMBIA UNIVERSITY',6,0,0,'USMARC','MARC-8'), ('siris-libraries.si.edu',210,'Default','','','SMITHSONIAN INSTITUTION LIBRARIES',10,0,0,'USMARC','MARC-8'); 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 bbaf5264a9..2fd772d582 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 @@ -INSERT INTO `z3950servers` (`host`, `port`, `db`, `userid`, `password`, `name`, `id`, `checked`, `rank`, `syntax`, `type`) 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`) VALUES ('z3950.bnf.fr', 2211, 'TOUT', 'Z3950', 'Z3950_BNF', 'BNF2', 2, 1, 2, 'UNIMARC', 'zed'); diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql b/installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql index c4d1e4697c..8a4db1203a 100644 --- a/installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql +++ b/installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql @@ -1,4 +1,4 @@ -INSERT INTO z3950servers (host, port, db, userid, password, name, id, checked, rank, syntax, timeout, type, encoding) VALUES +INSERT INTO z3950servers (host, port, db, userid, password, servername, id, checked, rank, syntax, timeout, servertype, encoding) VALUES ('lx2.loc.gov',210,'LCDB','','','LIBRARY OF CONGRESS',1,0,0,'USMARC',0,'zed','utf8'), ('z3950.bibsys.no',2100,'BIBSYS','','','BIBSYS',12,1,1,'NORMARC',0,'zed','ISO_8859-1'), ('z3950.nb.no',2100,'Norbok','','','NORBOK',13,0,0,'NORMARC',0,'zed','ISO_8859-1'), diff --git a/installer/data/mysql/pl-PL/optional/sample_z3950_servers.sql b/installer/data/mysql/pl-PL/optional/sample_z3950_servers.sql index 992bc024c4..10684e1357 100644 --- a/installer/data/mysql/pl-PL/optional/sample_z3950_servers.sql +++ b/installer/data/mysql/pl-PL/optional/sample_z3950_servers.sql @@ -1,5 +1,5 @@ INSERT INTO `z3950servers` -(`host`, `port`, `db`, `userid`, `password`, `name`, `id`, `checked`, `rank`, `syntax`, `encoding`) VALUES +(`host`, `port`, `db`, `userid`, `password`, `servername`, `id`, `checked`, `rank`, `syntax`, `encoding`) VALUES ('193.59.172.100',210,'INNOPAC','','','BIBLIOTEKA NARODOWA',1,1,1,'MARC21','UTF8'), ('62.181.1.243',4321,'bilbo','','','BP BEMOWO',2,1,1,'MARC21','UTF8'), ('lx2.loc.gov',210,'LCDB','','','LIBRARY OF CONGRESS',3,0,1,'USMARC','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 ba2540cf19..eb90f295f1 100644 --- a/installer/data/mysql/ru-RU/optional/z39-50servers_collection.sql +++ b/installer/data/mysql/ru-RU/optional/z39-50servers_collection.sql @@ -1,7 +1,7 @@ TRUNCATE z3950servers; -INSERT INTO `z3950servers` -(`host`, `port`, `db`, `userid`, `password`, `name`, `id`, `checked`, `rank`, `syntax`, `type`, `encoding`) VALUES +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'), ('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'), 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 ba2540cf19..eb90f295f1 100644 --- a/installer/data/mysql/uk-UA/optional/z39-50servers_collection.sql +++ b/installer/data/mysql/uk-UA/optional/z39-50servers_collection.sql @@ -1,7 +1,7 @@ TRUNCATE z3950servers; -INSERT INTO `z3950servers` -(`host`, `port`, `db`, `userid`, `password`, `name`, `id`, `checked`, `rank`, `syntax`, `type`, `encoding`) VALUES +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'), ('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'), -- 2.20.1