From 936c86478d4b955b3da078d52b3693622f0bd183 Mon Sep 17 00:00:00 2001 From: mike Date: Thu, 2 Nov 2006 17:48:25 +0000 Subject: [PATCH] Use z3950.indexdata.com instead of bagel.indexdata.com everywhere --- Changes | 4 ++-- lib/ZOOM.pod | 4 ++-- samples/net-z3950-zoom/async.pl | 6 +++--- samples/net-z3950-zoom/zoomtst1.pl | 4 ++-- samples/net-z3950-zoom/zoomtst3.pl | 6 +++--- samples/net-z3950/zoomtst1.pl | 4 ++-- samples/zoom/async.pl | 6 +++--- samples/zoom/trivial-async.pl | 2 +- samples/zoom/zoomtst1.pl | 4 ++-- samples/zoom/zoomtst3.pl | 6 +++--- t/1-Net-Z3950-ZOOM.t | 6 +++--- t/12-query.t | 4 ++-- t/13-resultset.t | 4 ++-- t/14-sorting.t | 4 ++-- t/15-scan.t | 4 ++-- t/19-events.t | 4 ++-- t/2-ZOOM.t | 6 +++--- t/22-query.t | 4 ++-- t/23-resultset.t | 4 ++-- t/24-sorting.t | 4 ++-- t/25-scan.t | 4 ++-- t/29-events.t | 4 ++-- 22 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Changes b/Changes index 01043f3..d699105 100644 --- a/Changes +++ b/Changes @@ -1,4 +1,4 @@ -$Id: Changes,v 1.46 2006-11-02 17:05:01 mike Exp $ +$Id: Changes,v 1.47 2006-11-02 17:48:25 mike Exp $ Revision history for Perl extension Net::Z3950::ZOOM. @@ -13,7 +13,7 @@ Revision history for Perl extension Net::Z3950::ZOOM. - ZOOM::ResultSet::record() throws a diagnostic if asked to retrieve records out of range for the result-set. - All tests against indexdata.com are now explicitly against - bagel.indexdata.com, as the identity of the former name has + z3950.indexdata.com, as the identity of the former name has recently changed. 1.12 (NEVER PUBLICLY RELEASED; these changes are included in 1.13) diff --git a/lib/ZOOM.pod b/lib/ZOOM.pod index 73e122a..bcce2b3 100644 --- a/lib/ZOOM.pod +++ b/lib/ZOOM.pod @@ -1,4 +1,4 @@ -# $Id: ZOOM.pod,v 1.37 2006-06-15 15:42:30 mike Exp $ +# $Id: ZOOM.pod,v 1.38 2006-11-02 17:48:25 mike Exp $ use strict; use warnings; @@ -1444,7 +1444,7 @@ result-set of each server as soon as it becomes available. use ZOOM; @servers = ('z3950.loc.gov:7090/Voyager', - 'bagel.indexdata.com:210/gils', + 'z3950.indexdata.com:210/gils', 'agricola.nal.usda.gov:7190/Voyager'); for ($i = 0; $i < @servers; $i++) { $z[$i] = new ZOOM::Connection($servers[$i], 0, diff --git a/samples/net-z3950-zoom/async.pl b/samples/net-z3950-zoom/async.pl index 9341168..470cfff 100644 --- a/samples/net-z3950-zoom/async.pl +++ b/samples/net-z3950-zoom/async.pl @@ -1,9 +1,9 @@ -# $Id: async.pl,v 1.2 2006-04-07 12:36:34 mike Exp $ +# $Id: async.pl,v 1.3 2006-11-02 17:48:25 mike Exp $ # # See ../README for a description of this program. # perl -I../../blib/lib -I../../blib/arch zoomtst3.pl [...] # for example: -# perl -I../../blib/lib -I../../blib/arch async.pl z3950.loc.gov:7090/Voyager bagel.indexdata.com:210/gils endeavor.flo.org:7090/Voyager mineral +# perl -I../../blib/lib -I../../blib/arch async.pl z3950.loc.gov:7090/Voyager z3950.indexdata.com:210/gils endeavor.flo.org:7090/Voyager mineral use strict; use warnings; @@ -11,7 +11,7 @@ use Net::Z3950::ZOOM; if (@ARGV < 2) { print STDERR "Usage: $0 target1 target2 ... targetN query\n"; - print STDERR " eg. $0 bagel.indexdata.dk/gils localhost:9999 fish\n"; + print STDERR " eg. $0 z3950.indexdata.dk/gils localhost:9999 fish\n"; exit 1; } diff --git a/samples/net-z3950-zoom/zoomtst1.pl b/samples/net-z3950-zoom/zoomtst1.pl index a08cd89..47fc660 100644 --- a/samples/net-z3950-zoom/zoomtst1.pl +++ b/samples/net-z3950-zoom/zoomtst1.pl @@ -1,4 +1,4 @@ -# $Id: zoomtst1.pl,v 1.2 2005-10-12 14:35:58 mike Exp $ +# $Id: zoomtst1.pl,v 1.3 2006-11-02 17:48:25 mike Exp $ # # See ../README for a description of this program. # perl -I../../blib/lib -I../../blib/arch zoomtst1.pl @@ -9,7 +9,7 @@ use Net::Z3950::ZOOM; if (@ARGV != 2) { print STDERR "Usage: $0 target query\n"; - print STDERR " eg. $0 bagel.indexdata.dk/gils computer\n"; + print STDERR " eg. $0 z3950.indexdata.dk/gils computer\n"; exit 1; } diff --git a/samples/net-z3950-zoom/zoomtst3.pl b/samples/net-z3950-zoom/zoomtst3.pl index 472b846..8f044f6 100644 --- a/samples/net-z3950-zoom/zoomtst3.pl +++ b/samples/net-z3950-zoom/zoomtst3.pl @@ -1,9 +1,9 @@ -# $Id: zoomtst3.pl,v 1.7 2006-04-07 12:39:06 mike Exp $ +# $Id: zoomtst3.pl,v 1.8 2006-11-02 17:48:25 mike Exp $ # # See ../README for a description of this program. # perl -I../../blib/lib -I../../blib/arch zoomtst3.pl [...] # for example: -# perl -I../../blib/lib -I../../blib/arch zoomtst3.pl z3950.loc.gov:7090/Voyager bagel.indexdata.com:210/gils endeavor.flo.org:7090/Voyager mineral +# perl -I../../blib/lib -I../../blib/arch zoomtst3.pl z3950.loc.gov:7090/Voyager z3950.indexdata.com:210/gils endeavor.flo.org:7090/Voyager mineral use strict; use warnings; @@ -11,7 +11,7 @@ use Net::Z3950::ZOOM; if (@ARGV < 2) { print STDERR "Usage: $0 target1 target2 ... targetN query\n"; - print STDERR " eg. $0 bagel.indexdata.dk/gils localhost:9999 fish\n"; + print STDERR " eg. $0 z3950.indexdata.dk/gils localhost:9999 fish\n"; exit 1; } diff --git a/samples/net-z3950/zoomtst1.pl b/samples/net-z3950/zoomtst1.pl index 8926a54..86c75af 100644 --- a/samples/net-z3950/zoomtst1.pl +++ b/samples/net-z3950/zoomtst1.pl @@ -1,4 +1,4 @@ -# $Id: zoomtst1.pl,v 1.3 2005-12-14 11:17:30 mike Exp $ +# $Id: zoomtst1.pl,v 1.4 2006-11-02 17:48:25 mike Exp $ # # See ../README for a description of this program. # perl -I../../blib/lib -I../../blib/arch zoomtst1.pl @@ -9,7 +9,7 @@ use Net::Z3950; if (@ARGV != 2) { print STDERR "Usage: $0 target query\n"; - print STDERR " eg. $0 bagel.indexdata.dk/gils computer\n"; + print STDERR " eg. $0 z3950.indexdata.dk/gils computer\n"; exit 1; } diff --git a/samples/zoom/async.pl b/samples/zoom/async.pl index d3a9583..ac3e5f9 100644 --- a/samples/zoom/async.pl +++ b/samples/zoom/async.pl @@ -1,9 +1,9 @@ -# $Id: async.pl,v 1.1 2006-04-07 12:58:37 mike Exp $ +# $Id: async.pl,v 1.2 2006-11-02 17:48:26 mike Exp $ # # See ../README for a description of this program. # perl -I../../blib/lib -I../../blib/arch async.pl [...] # for example: -# perl -I../../blib/lib -I../../blib/arch async.pl z3950.loc.gov:7090/Voyager bagel.indexdata.com:210/gils endeavor.flo.org:7090/Voyager mineral +# perl -I../../blib/lib -I../../blib/arch async.pl z3950.loc.gov:7090/Voyager z3950.indexdata.com:210/gils endeavor.flo.org:7090/Voyager mineral use strict; use warnings; @@ -11,7 +11,7 @@ use ZOOM; if (@ARGV < 2) { print STDERR "Usage: $0 target1 target2 ... targetN query\n"; - print STDERR " eg. $0 bagel.indexdata.dk/gils localhost:9999 fish\n"; + print STDERR " eg. $0 z3950.indexdata.dk/gils localhost:9999 fish\n"; exit 1; } diff --git a/samples/zoom/trivial-async.pl b/samples/zoom/trivial-async.pl index 43cea2c..1f588be 100644 --- a/samples/zoom/trivial-async.pl +++ b/samples/zoom/trivial-async.pl @@ -1,6 +1,6 @@ use ZOOM; @servers = ('z3950.loc.gov:7090/Voyager', - 'bagel.indexdata.com:210/gils', + 'z3950.indexdata.com:210/gils', 'agricola.nal.usda.gov:7190/Voyager'); for ($i = 0; $i < @servers; $i++) { $z[$i] = new ZOOM::Connection($servers[$i], 0, diff --git a/samples/zoom/zoomtst1.pl b/samples/zoom/zoomtst1.pl index 01f9bd5..2e3e0b3 100644 --- a/samples/zoom/zoomtst1.pl +++ b/samples/zoom/zoomtst1.pl @@ -1,4 +1,4 @@ -# $Id: zoomtst1.pl,v 1.3 2005-10-12 14:35:23 mike Exp $ +# $Id: zoomtst1.pl,v 1.4 2006-11-02 17:48:26 mike Exp $ # # See ../README for a description of this program. # perl -I../../blib/lib -I../../blib/arch zoomtst1.pl @@ -9,7 +9,7 @@ use ZOOM; if (@ARGV != 2) { print STDERR "Usage: $0 target query\n"; - print STDERR " eg. $0 bagel.indexdata.dk/gils computer\n"; + print STDERR " eg. $0 z3950.indexdata.dk/gils computer\n"; exit 1; } my($host, $query) = @ARGV; diff --git a/samples/zoom/zoomtst3.pl b/samples/zoom/zoomtst3.pl index 478faf1..eb72ed0 100644 --- a/samples/zoom/zoomtst3.pl +++ b/samples/zoom/zoomtst3.pl @@ -1,9 +1,9 @@ -# $Id: zoomtst3.pl,v 1.5 2006-04-07 12:43:28 mike Exp $ +# $Id: zoomtst3.pl,v 1.6 2006-11-02 17:48:26 mike Exp $ # # See ../README for a description of this program. # perl -I../../blib/lib -I../../blib/arch zoomtst3.pl [...] # for example: -# perl -I../../blib/lib -I../../blib/arch zoomtst3.pl z3950.loc.gov:7090/Voyager bagel.indexdata.com:210/gils endeavor.flo.org:7090/Voyager mineral +# perl -I../../blib/lib -I../../blib/arch zoomtst3.pl z3950.loc.gov:7090/Voyager z3950.indexdata.com:210/gils endeavor.flo.org:7090/Voyager mineral use strict; use warnings; @@ -11,7 +11,7 @@ use ZOOM; if (@ARGV < 2) { print STDERR "Usage: $0 target1 target2 ... targetN query\n"; - print STDERR " eg. $0 bagel.indexdata.dk/gils localhost:9999 fish\n"; + print STDERR " eg. $0 z3950.indexdata.dk/gils localhost:9999 fish\n"; exit 1; } diff --git a/t/1-Net-Z3950-ZOOM.t b/t/1-Net-Z3950-ZOOM.t index 67bc2c9..fb7e832 100644 --- a/t/1-Net-Z3950-ZOOM.t +++ b/t/1-Net-Z3950-ZOOM.t @@ -1,4 +1,4 @@ -# $Id: 1-Net-Z3950-ZOOM.t,v 1.14 2006-11-02 17:04:36 mike Exp $ +# $Id: 1-Net-Z3950-ZOOM.t,v 1.15 2006-11-02 17:48:26 mike Exp $ # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 1-Net-Z3950-ZOOM.t' @@ -19,7 +19,7 @@ $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo); ok($errcode == Net::Z3950::ZOOM::ERROR_CONNECT && $addinfo eq $host, "connection to non-existent host '$host' fails"); -$host = "bagel.indexdata.com/gils"; +$host = "z3950.indexdata.com/gils"; $conn = Net::Z3950::ZOOM::connection_new($host, 0); $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo); ok($errcode == 0, "connection to '$host'"); @@ -84,7 +84,7 @@ my $data = Net::Z3950::ZOOM::record_get($rec, "render", $len); ok($data =~ /^245 +\$a ISOTOPIC DATES OF ROCKS AND MINERALS$/m, "rendered record has expected title"); my $raw = Net::Z3950::ZOOM::record_get($rec, "raw", $len); -ok($raw =~ /^00981n/, "raw record contains expected header"); +ok($raw =~ /^00966n/, "raw record contains expected header"); Net::Z3950::ZOOM::resultset_destroy($rs); ok(1, "destroyed result-set"); diff --git a/t/12-query.t b/t/12-query.t index a6ef92b..7804c37 100644 --- a/t/12-query.t +++ b/t/12-query.t @@ -1,4 +1,4 @@ -# $Id: 12-query.t,v 1.8 2006-11-02 17:04:36 mike Exp $ +# $Id: 12-query.t,v 1.9 2006-11-02 17:48:26 mike Exp $ # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 12-query.t' @@ -46,7 +46,7 @@ ok(1, "destroyed complex query"); # no other uses of query objects -- but we need to establish a # connection for it to work on first. -my $host = "bagel.indexdata.com/gils"; +my $host = "z3950.indexdata.com/gils"; my $conn = Net::Z3950::ZOOM::connection_new($host, 0); my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy"); $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo); diff --git a/t/13-resultset.t b/t/13-resultset.t index 0e402e0..5c771f1 100644 --- a/t/13-resultset.t +++ b/t/13-resultset.t @@ -1,4 +1,4 @@ -# $Id: 13-resultset.t,v 1.7 2006-11-02 17:04:36 mike Exp $ +# $Id: 13-resultset.t,v 1.8 2006-11-02 17:48:26 mike Exp $ # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 13-resultset.t' @@ -10,7 +10,7 @@ BEGIN { use_ok('Net::Z3950::ZOOM') }; my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy"); -my $host = "bagel.indexdata.com/gils"; +my $host = "z3950.indexdata.com/gils"; my $conn = Net::Z3950::ZOOM::connection_new($host, 0); $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo); ok($errcode == 0, "connection to '$host'"); diff --git a/t/14-sorting.t b/t/14-sorting.t index af035e8..ea74c6c 100644 --- a/t/14-sorting.t +++ b/t/14-sorting.t @@ -1,4 +1,4 @@ -# $Id: 14-sorting.t,v 1.7 2006-11-02 17:04:36 mike Exp $ +# $Id: 14-sorting.t,v 1.8 2006-11-02 17:48:26 mike Exp $ # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 14-sorting.t' @@ -12,7 +12,7 @@ BEGIN { use_ok('Net::Z3950::ZOOM') }; my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy"); -my $host = "bagel.indexdata.com/gils"; +my $host = "z3950.indexdata.com/gils"; my $conn = Net::Z3950::ZOOM::connection_new($host, 0); $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo); ok($errcode == 0, "connection to '$host'"); diff --git a/t/15-scan.t b/t/15-scan.t index ba7f72b..5a223a4 100644 --- a/t/15-scan.t +++ b/t/15-scan.t @@ -1,4 +1,4 @@ -# $Id: 15-scan.t,v 1.12 2006-11-02 17:04:36 mike Exp $ +# $Id: 15-scan.t,v 1.13 2006-11-02 17:48:26 mike Exp $ # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 15-scan.t' @@ -11,7 +11,7 @@ BEGIN { use_ok('Net::Z3950::ZOOM') }; my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy"); -my $host = "bagel.indexdata.com/gils"; +my $host = "z3950.indexdata.com/gils"; my $conn = Net::Z3950::ZOOM::connection_new($host, 0); $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo); ok($errcode == 0, "connection to '$host'"); diff --git a/t/19-events.t b/t/19-events.t index 49546ca..983c2e1 100644 --- a/t/19-events.t +++ b/t/19-events.t @@ -1,4 +1,4 @@ -# $Id: 19-events.t,v 1.6 2006-11-02 17:04:36 mike Exp $ +# $Id: 19-events.t,v 1.7 2006-11-02 17:48:26 mike Exp $ # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 19-events.t' @@ -17,7 +17,7 @@ my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy"); my $options = Net::Z3950::ZOOM::options_create(); Net::Z3950::ZOOM::options_set($options, async => 1); -my $host = "bagel.indexdata.com/gils"; +my $host = "z3950.indexdata.com/gils"; my $conn = Net::Z3950::ZOOM::connection_create($options); Net::Z3950::ZOOM::connection_connect($conn, $host, 0); $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo); diff --git a/t/2-ZOOM.t b/t/2-ZOOM.t index 868b338..0003976 100644 --- a/t/2-ZOOM.t +++ b/t/2-ZOOM.t @@ -1,4 +1,4 @@ -# $Id: 2-ZOOM.t,v 1.11 2006-11-02 17:04:36 mike Exp $ +# $Id: 2-ZOOM.t,v 1.12 2006-11-02 17:48:26 mike Exp $ # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 2-ZOOM.t' @@ -18,7 +18,7 @@ ok($@ && $@->isa("ZOOM::Exception") && $@->code() == ZOOM::Error::CONNECT && $@->addinfo() eq $host, "connection to non-existent host '$host' fails"); -$host = "bagel.indexdata.com/gils"; +$host = "z3950.indexdata.com/gils"; eval { $conn = new ZOOM::Connection($host, 0) }; ok(!$@, "connection to '$host'"); @@ -75,7 +75,7 @@ my $data = $rec->render(); ok($data =~ /^245 +\$a ISOTOPIC DATES OF ROCKS AND MINERALS$/m, "rendered record has expected title"); my $raw = $rec->raw(); -ok($raw =~ /^00981n/, "raw record contains expected header"); +ok($raw =~ /^00966n/, "raw record contains expected header"); $rs->destroy(); ok(1, "destroyed result-set"); diff --git a/t/22-query.t b/t/22-query.t index 0f6141b..5da0ceb 100644 --- a/t/22-query.t +++ b/t/22-query.t @@ -1,4 +1,4 @@ -# $Id: 22-query.t,v 1.10 2006-11-02 17:04:36 mike Exp $ +# $Id: 22-query.t,v 1.11 2006-11-02 17:48:26 mike Exp $ # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 22-query.t' @@ -51,7 +51,7 @@ ok(1, "destroyed complex query"); # no other uses of query objects -- but we need to establish a # connection for it to work on first. -my $host = "bagel.indexdata.com/gils"; +my $host = "z3950.indexdata.com/gils"; my $conn; eval { $conn = new ZOOM::Connection($host, 0, preferredRecordSyntax => "usmarc") }; diff --git a/t/23-resultset.t b/t/23-resultset.t index a8156e1..5e4d9c8 100644 --- a/t/23-resultset.t +++ b/t/23-resultset.t @@ -1,4 +1,4 @@ -# $Id: 23-resultset.t,v 1.4 2006-11-02 17:04:36 mike Exp $ +# $Id: 23-resultset.t,v 1.5 2006-11-02 17:48:26 mike Exp $ # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 23-resultset.t' @@ -8,7 +8,7 @@ use warnings; use Test::More tests => 23; BEGIN { use_ok('ZOOM') }; -my $host = "bagel.indexdata.com/gils"; +my $host = "z3950.indexdata.com/gils"; my $conn; eval { $conn = new ZOOM::Connection($host, 0) }; ok(!$@, "connection to '$host'"); diff --git a/t/24-sorting.t b/t/24-sorting.t index 381cf8c..c3e7cf3 100644 --- a/t/24-sorting.t +++ b/t/24-sorting.t @@ -1,4 +1,4 @@ -# $Id: 24-sorting.t,v 1.6 2006-11-02 17:04:36 mike Exp $ +# $Id: 24-sorting.t,v 1.7 2006-11-02 17:48:26 mike Exp $ # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 24-sorting.t' @@ -10,7 +10,7 @@ use MARC::Record; BEGIN { use_ok('ZOOM') }; -my $host = "bagel.indexdata.com/gils"; +my $host = "z3950.indexdata.com/gils"; my $conn; eval { $conn = new ZOOM::Connection($host, 0) }; ok(!$@, "connection to '$host'"); diff --git a/t/25-scan.t b/t/25-scan.t index f81acb6..d0a5927 100644 --- a/t/25-scan.t +++ b/t/25-scan.t @@ -1,4 +1,4 @@ -# $Id: 25-scan.t,v 1.9 2006-11-02 17:04:36 mike Exp $ +# $Id: 25-scan.t,v 1.10 2006-11-02 17:48:26 mike Exp $ # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 25-scan.t' @@ -9,7 +9,7 @@ use Test::More tests => 87; BEGIN { use_ok('ZOOM') }; -my $host = "bagel.indexdata.com/gils"; +my $host = "z3950.indexdata.com/gils"; my $conn; eval { $conn = new ZOOM::Connection($host, 0) }; ok(!$@, "connection to '$host'"); diff --git a/t/29-events.t b/t/29-events.t index dabd136..c8e851e 100644 --- a/t/29-events.t +++ b/t/29-events.t @@ -1,4 +1,4 @@ -# $Id: 29-events.t,v 1.3 2006-11-02 17:04:36 mike Exp $ +# $Id: 29-events.t,v 1.4 2006-11-02 17:48:26 mike Exp $ # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl 19-events.t' @@ -14,7 +14,7 @@ ok(ZOOM::event_str(ZOOM::Event::CONNECT) eq "connect", my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy"); -my $host = "bagel.indexdata.com/gils"; +my $host = "z3950.indexdata.com/gils"; my $conn = create ZOOM::Connection(async => 1); eval { $conn->connect($host) }; ok(!$@, "connection to '$host'"); -- 1.7.10.4