Call $rec->append_entry() to note results of test.

[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 b1789c7..997cc17 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.2 2006-06-21 14:35:09 mike Exp $
+# $Id: Ping.pm,v 1.8 2006-07-21 16:49:52 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -19,82 +19,37 @@ sub run {
     my $pod = $irspy->pod();
 
     $pod->callback(ZOOM::Event::CONNECT, \&connected);
-    my $err = $pod->wait();
+    $pod->callback("exception", \&not_connected);
+    my $err = $pod->wait($irspy);
 
     return 0;
 }
 
 
-sub connected {
-    my($conn, $state, $rs, $event) = @_;
-    print $conn->option("host"), ": connected\n";
+sub connected { maybe_connected(@_, 1) }
+sub not_connected { maybe_connected(@_, 0) }
+
+sub maybe_connected {
+    my($conn, $irspy, $rs, $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'>" .
+                      isodate(time()) . "</irspy:probe>");
     return 0;
 }
 
 
-# Some of this Pod-using code may be useful.
-#
-#$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 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);
+}
 
 
 1;