From 2db93a5a02229279216e15d39265c7976ca82ea4 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Mon, 8 Jun 2015 02:15:03 +0200 Subject: [PATCH] Bug 4925: Remove Smithsonian as a delivered z39.50 target Removes the Smithsonian as a target installed with the sample data during installation. Also adds the newer LOC authority targets to files where they were missing. To test: - Verify the Smithsonian has been removed from all translated installers - Verify the files are still valid SQL and install correctly NOTE: There was tiny scope creep which included ensuring there were two Authority z39.50 servers as well. Text files properly reflect the removal. SQL 'source' of SQL files worked properly. Was able to Z39.50 search for all of the 'en'. Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 0ca21c1e488f150cca74beb9a67b285e5531f3b5) Signed-off-by: Chris Cormack Signed-off-by: Liz Rea --- .../mysql/de-DE/optional/sample_z3950_servers.sql | 3 +-- .../mysql/de-DE/optional/sample_z3950_servers.txt | 3 ++- .../data/mysql/en/optional/sample_z3950_servers.sql | 3 +-- .../data/mysql/en/optional/sample_z3950_servers.txt | 1 - .../mysql/es-ES/optional/sample_z3950_servers.sql | 11 ++++++----- .../mysql/es-ES/optional/sample_z3950_servers.txt | 3 ++- .../mysql/pl-PL/optional/sample_z3950_servers.sql | 3 +-- .../mysql/pl-PL/optional/sample_z3950_servers.txt | 1 - 8 files changed, 13 insertions(+), 15 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 8006f37e37..b52a939748 100644 --- a/installer/data/mysql/de-DE/optional/sample_z3950_servers.sql +++ b/installer/data/mysql/de-DE/optional/sample_z3950_servers.sql @@ -3,8 +3,7 @@ INSERT INTO z3950servers ('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'), -('clio-db.cc.columbia.edu',7090,'voyager','','','COLUMBIA UNIVERSITY',0,0,'USMARC','MARC-8','biblio'), -('siris-libraries.si.edu',210,'Default','','','SMITHSONIAN INSTITUTION LIBRARIES',0,0,'USMARC','MARC-8','biblio'); +('clio-db.cc.columbia.edu',7090,'voyager','','','COLUMBIA UNIVERSITY',0,0,'USMARC','MARC-8','biblio'); #Insert SRU server INSERT INTO z3950servers diff --git a/installer/data/mysql/de-DE/optional/sample_z3950_servers.txt b/installer/data/mysql/de-DE/optional/sample_z3950_servers.txt index 4cba418f39..a151dd832b 100644 --- a/installer/data/mysql/de-DE/optional/sample_z3950_servers.txt +++ b/installer/data/mysql/de-DE/optional/sample_z3950_servers.txt @@ -1,4 +1,5 @@ Vorkonfigurierte Z39.50-Server: LIBRARY OF CONGRESS +LIBRARY OF CONGRESS NAMES (Normsätze) +LIBRARY OF CONGRESS SUBJECTS (Normsätze) COLUMBIA UNIVERSITY -SMITHSONIAN INSTITUTION LIBRARIES diff --git a/installer/data/mysql/en/optional/sample_z3950_servers.sql b/installer/data/mysql/en/optional/sample_z3950_servers.sql index 8006f37e37..b52a939748 100644 --- a/installer/data/mysql/en/optional/sample_z3950_servers.sql +++ b/installer/data/mysql/en/optional/sample_z3950_servers.sql @@ -3,8 +3,7 @@ INSERT INTO z3950servers ('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'), -('clio-db.cc.columbia.edu',7090,'voyager','','','COLUMBIA UNIVERSITY',0,0,'USMARC','MARC-8','biblio'), -('siris-libraries.si.edu',210,'Default','','','SMITHSONIAN INSTITUTION LIBRARIES',0,0,'USMARC','MARC-8','biblio'); +('clio-db.cc.columbia.edu',7090,'voyager','','','COLUMBIA UNIVERSITY',0,0,'USMARC','MARC-8','biblio'); #Insert SRU server INSERT INTO z3950servers diff --git a/installer/data/mysql/en/optional/sample_z3950_servers.txt b/installer/data/mysql/en/optional/sample_z3950_servers.txt index 0adcde2d32..a0bab985a3 100644 --- a/installer/data/mysql/en/optional/sample_z3950_servers.txt +++ b/installer/data/mysql/en/optional/sample_z3950_servers.txt @@ -2,4 +2,3 @@ LIBRARY OF CONGRESS LIBRARY OF CONGRESS NAMES (authority records) LIBRARY OF CONGRESS SUBJECTS (authority records) COLUMBIA UNIVERSITY -SMITHSONIAN INSTITUTION LIBRARIES 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 9099566b45..b52a939748 100644 --- a/installer/data/mysql/es-ES/optional/sample_z3950_servers.sql +++ b/installer/data/mysql/es-ES/optional/sample_z3950_servers.sql @@ -1,8 +1,9 @@ -INSERT INTO `z3950servers` -(`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'); +INSERT INTO z3950servers +(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'), +('clio-db.cc.columbia.edu',7090,'voyager','','','COLUMBIA UNIVERSITY',0,0,'USMARC','MARC-8','biblio'); #Insert SRU server INSERT INTO z3950servers diff --git a/installer/data/mysql/es-ES/optional/sample_z3950_servers.txt b/installer/data/mysql/es-ES/optional/sample_z3950_servers.txt index 89d7250095..ab5499c7fe 100644 --- a/installer/data/mysql/es-ES/optional/sample_z3950_servers.txt +++ b/installer/data/mysql/es-ES/optional/sample_z3950_servers.txt @@ -1,3 +1,4 @@ LIBRARY OF CONGRESS +LIBRARY OF CONGRESS NAMES +LIBRARY OF CONGRESS SUBJECTS COLUMBIA UNIVERSITY -SMITHSONIAN INSTITUTION LIBRARIES 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 ecbcc71c2d..d9a188cf4f 100644 --- a/installer/data/mysql/pl-PL/optional/sample_z3950_servers.sql +++ b/installer/data/mysql/pl-PL/optional/sample_z3950_servers.sql @@ -4,8 +4,7 @@ INSERT INTO z3950servers ('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'), -('clio-db.cc.columbia.edu',7090,'voyager','','','COLUMBIA UNIVERSITY',0,0,'USMARC','MARC-8','biblio'), -('siris-libraries.si.edu',210,'Default','','','SMITHSONIAN INSTITUTION LIBRARIES',0,0,'USMARC','MARC-8','biblio'); +('clio-db.cc.columbia.edu',7090,'voyager','','','COLUMBIA UNIVERSITY',0,0,'USMARC','MARC-8','biblio'); #Insert SRU server INSERT INTO z3950servers diff --git a/installer/data/mysql/pl-PL/optional/sample_z3950_servers.txt b/installer/data/mysql/pl-PL/optional/sample_z3950_servers.txt index afb8fee221..9b88e7b960 100644 --- a/installer/data/mysql/pl-PL/optional/sample_z3950_servers.txt +++ b/installer/data/mysql/pl-PL/optional/sample_z3950_servers.txt @@ -3,4 +3,3 @@ BIBLIOTEKA KONGRESU BIBLIOTEKA KONGRESU FORMALNE (Hasła wzorcowe) BIBLIOTEKA KONGRESU PRZEDMIOTOWE (Hasła wzorcowe) COLUMBIA UNIVERSITY -SMITHSONIAN INSTITUTION LIBRARIES -- 2.39.5