Avoid using Text::Iconv->retval(), which is not in the version on Debian Testing.

[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 a105a28..7f14db2 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.9 2006-07-24 16:16:29 mike Exp $
+# $Id: Ping.pm,v 1.22 2007-03-02 12:17:33 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -9,20 +9,21 @@ 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();
+use Text::Iconv;
+my $conv = new Text::Iconv("LATIN1", "UTF8");
 
-    $pod->callback(ZOOM::Event::CONNECT, \&connected);
-    $pod->callback("exception", \&not_connected);
-    my $err = $pod->wait($irspy);
 
-    return 0;
+sub start {
+    my $class = shift();
+    my($conn) = @_;
+
+    $conn->irspy_connect(undef, {},
+                        ZOOM::Event::ZEND, \&connected,
+                        exception => \&not_connected);
 }
 
 
@@ -30,24 +31,58 @@ 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->log("irspy_test", ($ok ? "" : "not "), "connected");
+    my $rec = $conn->record();
     $rec->append_entry("irspy:status", "<irspy:probe ok='$ok'>" .
                       isodate(time()) . "</irspy:probe>");
-    $conn->option(pod_omit => 1) if !$ok;
-    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)) {
+           #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);
+           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 $ok ? ZOOM::IRSpy::Status::TEST_GOOD :
+                ZOOM::IRSpy::Status::TEST_BAD;
 }