"not connected" message is now logged at "irspy" level so it appears

[irspy-moved-to-github.git] / lib / ZOOM / IRSpy / Test / Ping.pm

diff --git a/lib/ZOOM/IRSpy/Test/Ping.pm b/lib/ZOOM/IRSpy/Test/Ping.pm
index 402a98e..bc915db 100644 (file)
--- a/lib/ZOOM/IRSpy/Test/Ping.pm
+++ b/lib/ZOOM/IRSpy/Test/Ping.pm
@@ -1,4 +1,4 @@
-# $Id: Ping.pm,v 1.1 2006-06-20 16:32:42 mike Exp $
+# $Id: Ping.pm,v 1.28 2008-07-16 11:51:09 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -9,83 +9,96 @@ use strict;
 use warnings;
 
 use ZOOM::IRSpy::Test;
-our @ISA;
-@ISA = qw(ZOOM::IRSpy::Test);
+our @ISA = qw(ZOOM::IRSpy::Test);
 
+use ZOOM::IRSpy::Utils qw(isodate);
 
-sub run {
-    my $this = shift();
+use Text::Iconv;
+my $conv = new Text::Iconv("LATIN1", "UTF8");
 
-    print "Running 'Ping' test\n";
-    ### Now actually do it
-    return 0;
+
+sub start {
+    my $class = shift();
+    my($conn) = @_;
+
+    my %options = ();
+    my $xc = $conn->record()->xpath_context();
+    my $user = $xc->find("e:serverInfo/e:authentication/e:user");
+    my $password = $xc->find("e:serverInfo/e:authentication/e:password");
+    $options{"*user"} = $user if $user;
+    $options{"*password"} = $password if $password;
+
+    $conn->irspy_connect(undef, \%options,
+                        ZOOM::Event::ZEND, \&connected,
+                        exception => \&not_connected);
+}
+
+
+sub connected {
+    my($conn, $__UNUSED_task, $__UNUSED_udata, $__UNUSED_event) = @_;
+
+    $conn->log("irspy_test", "connected");
+    $conn->record()->store_result("probe", ok => 1);
+
+    foreach my $opt (qw(search present delSet resourceReport
+                       triggerResourceCtrl resourceCtrl
+                       accessCtrl scan sort extendedServices
+                       level_1Segmentation level_2Segmentation
+                       concurrentOperations namedResultSets
+                       encapsulation resultCount negotiationModel
+                       duplicationDetection queryType104
+                       pQESCorrection stringSchema)) {
+       #print STDERR "\$conn->option('init_opt_$opt') = '", $conn->option("init_opt_$opt"), "'\n";
+       $conn->record()->store_result('init_opt', option => $opt)
+           if $conn->option("init_opt_$opt");
+    }
+
+    foreach my $opt (qw(serverImplementationId
+                       serverImplementationName
+                       serverImplementationVersion)) {
+       my $val = $conn->option($opt);
+       next if !defined $val; # not defined for SRU, for example
+
+       # There doesn't seem to be a reliable way to tell what
+       # character set the server uses for these.  At least one
+       # server (z3950.bcl.jcyl.es:210/AbsysCCFL) returns an ISO
+       # 8859-1 string containing an o-acute, which breaks the XML
+       # parser if we just insert it naively.  It seems reasonable,
+       # though, to guess that the great majority of servers will use
+       # ASCII, Latin-1 or Unicode.  The first of these is a subset
+       # of the second, so that brings it to down to two.  The
+       # strategy is simply this: assume it's ASCII-Latin-1, and try
+       # to convert to UTF-8.  If that conversion works, fine; if
+       # not, assume it's because the string was already UTF-8, so
+       # use it as is.
+       Text::Iconv->raise_error(1);
+       my $maybe;
+       eval {
+           $maybe = $conv->convert($val);
+       }; if (!$@ && $maybe ne $val) {
+           $conn->log("irspy", "converted '$val' from Latin-1 to UTF-8");
+           $val = $maybe;
+       }
+       $conn->record()->store_result($opt, value => $val);
+    }
+
+    return ZOOM::IRSpy::Status::TEST_GOOD;
 }
 
 
-# Some of this Pod-using code may be useful.
-#
-#my $pod = new ZOOM::Pod(@ARGV);
-#$pod->option(elementSetName => "b");
-#$pod->callback(ZOOM::Event::RECV_SEARCH, \&completed_search);
-#$pod->callback(ZOOM::Event::RECV_RECORD, \&got_record);
-##$pod->callback(exception => \&exception_thrown);
-#$pod->search_pqf("the");
-#my $err = $pod->wait();
-#die "$pod->wait() failed with error $err" if $err;
-#
-#sub completed_search {
-#    my($conn, $state, $rs, $event) = @_;
-#    print $conn->option("host"), ": found ", $rs->size(), " records\n";
-#    $state->{next_to_fetch} = 0;
-#    $state->{next_to_show} = 0;
-#    request_records($conn, $rs, $state, 2);
-#    return 0;
-#}
-#
-#sub got_record {
-#    my($conn, $state, $rs, $event) = @_;
-#
-#    {
-#      # Sanity-checking assertions.  These should be impossible
-#      my $ns = $state->{next_to_show};
-#      my $nf = $state->{next_to_fetch};
-#      if ($ns > $nf) {
-#          die "next_to_show > next_to_fetch ($ns > $nf)";
-#      } elsif ($ns == $nf) {
-#          die "next_to_show == next_to_fetch ($ns)";
-#      }
-#    }
-#
-#    my $i = $state->{next_to_show}++;
-#    my $rec = $rs->record($i);
-#    print $conn->option("host"), ": record $i is ", render_record($rec), "\n";
-#    request_records($conn, $rs, $state, 3)
-#      if $i == $state->{next_to_fetch}-1;
-#
-#    return 0;
-#}
-#
-#sub exception_thrown {
-#    my($conn, $state, $rs, $exception) = @_;
-#    print "Uh-oh!  $exception\n";
-#    return 0;
-#}
-#
-#sub request_records {
-#    my($conn, $rs, $state, $count) = @_;
-#
-#    my $i = $state->{next_to_fetch};
-#    ZOOM::Log::log("irspy", "requesting $count records from $i");
-#    $rs->records($i, $count, 0);
-#    $state->{next_to_fetch} += $count;
-#}
-#
-#sub render_record {
-#    my($rec) = @_;
-#
-#    return "undefined" if !defined $rec;
-#    return "'" . $rec->render() . "'";
-#}
+sub not_connected {
+    my($conn, $__UNUSED_task, $__UNUSED_udata, $exception) = @_;
+
+    $conn->log("irspy", "not connected: $exception");
+    $conn->record()->store_result("probe",
+                                 ok => 0,
+                                 errcode => $exception->code(),
+                                 errmsg => $exception->message(),
+                                 addinfo => $exception->addinfo(),
+                                 diagset => $exception->diagset());
+
+    return ZOOM::IRSpy::Status::TEST_BAD;
+}
 
 
 1;