X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FPing.pm;h=51283020fce5a24d784074b62ddf22ff836abbf2;hp=8fdfea890c5871bacec684ec33bf42d7b2069777;hb=5a79d757b02f1b232f651f0ef8296395723789e3;hpb=68baae39f76d2a37e3ade10aa37d974f93653567

diff --git a/lib/ZOOM/IRSpy/Test/Ping.pm b/lib/ZOOM/IRSpy/Test/Ping.pm
index 8fdfea8..5128302 100644
--- a/lib/ZOOM/IRSpy/Test/Ping.pm
+++ b/lib/ZOOM/IRSpy/Test/Ping.pm
@@ -1,4 +1,4 @@
-# $Id: Ping.pm,v 1.17 2006-12-06 12:58:06 mike Exp $
+# $Id: Ping.pm,v 1.21 2007-03-02 11:56:15 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -13,13 +13,16 @@ our @ISA = qw(ZOOM::IRSpy::Test);
 
 use ZOOM::IRSpy::Utils qw(isodate);
 
+use Text::Iconv;
+my $conv = new Text::Iconv("LATIN1", "UTF8");
+
 
 sub start {
     my $class = shift();
     my($conn) = @_;
 
     $conn->irspy_connect(undef, {},
-			 ZOOM::Event::RECV_APDU, \&connected,
+			 ZOOM::Event::ZEND, \&connected,
 			 exception => \&not_connected);
 }
 
@@ -44,11 +47,37 @@ sub maybe_connected {
 			    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);
+	    my $maybe = $conv->convert($val);
+	    if (defined $conv->retval() && $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;
 }