Note implementation details.

[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 997cc17..2eeda3b 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.8 2006-07-21 16:49:52 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,25 +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) = @_;
 
-    my $rec = $irspy->record($conn);
-    $irspy->log("irspy_test", $conn->option("host"),
-               ($ok ? "" : " not"), " connected");
-    $conn->option(pod_omit => 1) if !$ok;
-
-    $rec->append_entry("zeerex:serverInfo", "<irspy:probe ok='$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>");
-    return 0;
-}
-
-
-sub isodate {
-    my($time) = @_;
 
-    my($sec, $min, $hour, $mday, $mon, $year) = localtime($time);
-    return sprintf("%04d-%02d-%02dT%02d:%02d:%02d",
-                  $year+1900, $mon+1, $mday, $hour, $min, $sec);
+    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;
 }