X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FPing.pm;h=2eeda3bc53c6cce5c3c7b3aef381854cbc48325a;hp=f81aaaf8a1c3840160fa6ab4d220f37988b1351d;hb=eae0cc5511d06761d8067d7046d110ba8f25dd64;hpb=2f34c4f75b58742f952cea924bd94d5499928ee0

diff --git a/lib/ZOOM/IRSpy/Test/Ping.pm b/lib/ZOOM/IRSpy/Test/Ping.pm
index f81aaaf..2eeda3b 100644
--- a/lib/ZOOM/IRSpy/Test/Ping.pm
+++ b/lib/ZOOM/IRSpy/Test/Ping.pm
@@ -1,4 +1,4 @@
-# $Id: Ping.pm,v 1.11 2006-09-13 16:29:55 mike Exp $
+# $Id: Ping.pm,v 1.18 2006-12-15 17:23:27 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -9,20 +9,18 @@ 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();
-    my $irspy = $this->irspy();
-    my $pod = $irspy->pod();
 
-    $pod->callback(ZOOM::Event::CONNECT, \&connected);
-    $pod->callback("exception", \&not_connected);
-    my $err = $pod->wait($irspy);
+sub start {
+    my $class = shift();
+    my($conn) = @_;
 
-    return 0;
+    $conn->irspy_connect(undef, {},
+			 ZOOM::Event::RECV_APDU, \&connected,
+			 exception => \&not_connected);
 }
 
 
@@ -30,15 +28,36 @@ sub connected { maybe_connected(@_, 1) }
 sub not_connected { maybe_connected(@_, 0) }
 
 sub maybe_connected {
-    my($conn, $irspy, $rs, $event, $ok) = @_;
+    my($conn, $task, $__UNUSED_udata, $event, $ok) = @_;
 
-    $irspy->log("irspy_test", $conn->option("host"),
-		($ok ? "" : " not"), " connected");
-    my $rec = $irspy->record($conn);
+    $conn->log("irspy_test", ($ok ? "" : "not "), "connected");
+    my $rec = $conn->record();
     $rec->append_entry("irspy:status", "<irspy:probe ok='$ok'>" .
-		       $irspy->isodate(time()) . "</irspy:probe>");
-    $conn->option(pod_omit => 1) if !$ok;
-    return 0;
+		       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)) {
+	    $conn->record()->store_result('init_opt', option => $opt)
+		if $conn->option("init_opt_$opt");
+	}
+
+	foreach my $opt (qw(serverImplementationId
+			    serverImplementationName
+			    serverImplementationVersion)) {
+	    $conn->record()->store_result($opt, value => $conn->option($opt));
+	}
+    }
+
+
+    return $ok ? ZOOM::IRSpy::Status::TEST_GOOD :
+		 ZOOM::IRSpy::Status::TEST_BAD;
 }