Include CQL 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 5128302..5c93fb7 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.21 2007-03-02 11:56:15 mike Exp $
+# $Id: Ping.pm,v 1.23 2007-04-30 11:26:57 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -55,6 +55,9 @@ sub maybe_connected {
        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
@@ -67,9 +70,11 @@ sub maybe_connected {
            # 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) {
+           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;
            }