From b2870886baf2cefcce8859373d35f5a842ac8ac7 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@esilibrary.com>
Date: Fri, 25 Jan 2013 11:49:20 -0500
Subject: [PATCH] bug 9494: update default LOC z39.50 target settings

This patch updates the seed data from the target list at
http://www.loc.gov/z3950/lcserver.html#addr.

Comment: new target works. updated deleting and reloading
sample targets.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
I agree with Galen that this may need to be incorproated as a follow-up for current installations
Works fine for new installs
---
 C4/Koha.pm                                         |    4 ++--
 .../mysql/de-DE/optional/sample_z3950_servers.sql  |    2 +-
 .../mysql/en/optional/sample_z3950_servers.sql     |    2 +-
 .../mysql/es-ES/optional/sample_z3950_servers.sql  |    2 +-
 .../data/mysql/nb-NO/2-Valgfritt/z3950servers.sql  |    2 +-
 .../mysql/pl-PL/optional/sample_z3950_servers.sql  |    2 +-
 .../prog/en/modules/help/admin/z3950servers.tt     |    4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index 3892468..d3b7861 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -909,13 +909,13 @@ like:
 
     {
       'checked'    => 'checked',
-      'encoding'   => 'MARC-8'
+      'encoding'   => 'utf8',
       'icon'       => undef,
       'id'         => 'LIBRARY OF CONGRESS',
       'label'      => '',
       'name'       => 'server',
       'opensearch' => '',
-      'value'      => 'z3950.loc.gov:7090/',
+      'value'      => 'lx2.loc.gov:210/',
       'zed'        => 1,
     },
 
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 a06a0ad..472d8eb 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`, `id`, `checked`, `rank`, `syntax`, `encoding`) VALUES 
-('z3950.loc.gov',7090,'Voyager','','','LIBRARY OF CONGRESS',1,1,1,'USMARC','MARC-8'),
+('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/en/optional/sample_z3950_servers.sql b/installer/data/mysql/en/optional/sample_z3950_servers.sql
index a06a0ad..472d8eb 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`, `id`, `checked`, `rank`, `syntax`, `encoding`) VALUES 
-('z3950.loc.gov',7090,'Voyager','','','LIBRARY OF CONGRESS',1,1,1,'USMARC','MARC-8'),
+('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/es-ES/optional/sample_z3950_servers.sql b/installer/data/mysql/es-ES/optional/sample_z3950_servers.sql
index a06a0ad..472d8eb 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 
-('z3950.loc.gov',7090,'Voyager','','','LIBRARY OF CONGRESS',1,1,1,'USMARC','MARC-8'),
+('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/nb-NO/2-Valgfritt/z3950servers.sql b/installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql
index 1deca7a..7bba81b 100644
--- a/installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql
+++ b/installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql
@@ -1,5 +1,5 @@
 INSERT INTO z3950servers (host, port, db, userid, password, name, id, checked, rank, syntax, timeout, icon, position, type, encoding, description) VALUES
-('z3950.loc.gov',7090,'Voyager','','','LIBRARY OF CONGRESS',1,0,0,'USMARC',0,NULL,'primary','zed','MARC-8',''),
+('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',''),
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 2f2c173..992bc02 100644
--- a/installer/data/mysql/pl-PL/optional/sample_z3950_servers.sql
+++ b/installer/data/mysql/pl-PL/optional/sample_z3950_servers.sql
@@ -2,4 +2,4 @@ INSERT INTO `z3950servers`
 (`host`, `port`, `db`, `userid`, `password`, `name`, `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'),
-('z3950.loc.gov',7090,'Voyager','','','LIBRARY OF CONGRESS',3,0,1,'USMARC','MARC-8');
+('lx2.loc.gov',210,'LCDB','','','LIBRARY OF CONGRESS',3,0,1,'USMARC','utf8');
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
index df8cbad..5f09f34 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
@@ -26,7 +26,7 @@
 	<li>GREATER SUDBURY PUBLIC 216.223.90.51:210 INNOPAC</li>
 	<li>HALIFAX PUBLIC catalogue.halifaxpubliclibraries.ca:210 horizon</li>
 	<li>HALTON HILLS PUBLIC cat.hhpl.on.ca:210 halton_hills</li>
-	<li>LIBRARY OF CONGRESS z3950.loc.gov:7090 Voyager</li>
+	<li>LIBRARY OF CONGRESS lx2.loc.gov:210 LCDB</li>
 	<li>LONDON PUBLIC LIBRARY catalogue.londonpubliclibrary.ca:210 INNOPAC</li>
 	<li>MANITOBA PUBLIC library.gov.mb.ca:210 horizon</li>
 	<li>MILTON PL cat.mpl.on.ca:210 horizon</li>
@@ -38,4 +38,4 @@
 
 <p><strong>See the full documentation for Z39.50 Servers in the <a href="http://manual.koha-community.org/3.10/en/additionaladmin.html#z3950admin">manual</a> (online).</strong></p>
 
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]
-- 
1.7.2.5