X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FPing.pm;h=31b7f4d30296d8f3e9c58e7b5e95643bc0927598;hp=51283020fce5a24d784074b62ddf22ff836abbf2;hb=8d22b67928c9e2d65e90308dd7560dcd1d4d797a;hpb=3c4477e7a38ce6badda0cd3a1242c090fa128022

diff --git a/lib/ZOOM/IRSpy/Test/Ping.pm b/lib/ZOOM/IRSpy/Test/Ping.pm
index 5128302..31b7f4d 100644
--- a/lib/ZOOM/IRSpy/Test/Ping.pm
+++ b/lib/ZOOM/IRSpy/Test/Ping.pm
@@ -1,4 +1,3 @@
-# $Id: Ping.pm,v 1.21 2007-03-02 11:56:15 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -21,65 +20,83 @@ sub start {
     my $class = shift();
     my($conn) = @_;
 
-    $conn->irspy_connect(undef, {},
+    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 { maybe_connected(@_, 1) }
-sub not_connected { maybe_connected(@_, 0) }
-
-sub maybe_connected {
-    my($conn, $task, $__UNUSED_udata, $event, $ok) = @_;
-
-    $conn->log("irspy_test", ($ok ? "" : "not "), "connected");
-    my $rec = $conn->record();
-    $rec->append_entry("irspy:status", "<irspy:probe ok='$ok'>" .
-		       isodate(time()) . "</irspy:probe>");
-
-    if ($ok) {
-	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");
-	}
+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)) {
-	    # 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.
-	    my $val = $conn->option($opt);
-	    my $maybe = $conv->convert($val);
-	    if (defined $conv->retval() && $maybe ne $val) {
-		$conn->log("irspy", "converted '$val' from Latin-1 to UTF-8");
-		$val = $maybe;
-	    }
-	    $conn->record()->store_result($opt, value => $val);
+    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;
+}
+
+
+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 $ok ? ZOOM::IRSpy::Status::TEST_GOOD :
-		 ZOOM::IRSpy::Status::TEST_BAD;
+    return ZOOM::IRSpy::Status::TEST_BAD;
 }