X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FPing.pm;h=5c93fb7d6e46d614f6178e27b6d0bd371b46efad;hb=7249718226f5673f66d70044122215f673ada875;hp=6186c62f42b42cf5f09c55ed46e09eca4475f39c;hpb=66666cfa0fddff90e08c9e282cff62ba23dee3da;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Test/Ping.pm b/lib/ZOOM/IRSpy/Test/Ping.pm
index 6186c62..5c93fb7 100644
--- a/lib/ZOOM/IRSpy/Test/Ping.pm
+++ b/lib/ZOOM/IRSpy/Test/Ping.pm
@@ -1,4 +1,4 @@
-# $Id: Ping.pm,v 1.19 2007-01-20 09:53:40 mike Exp $
+# $Id: Ping.pm,v 1.23 2007-04-30 11:26:57 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);
 }
 
@@ -52,7 +55,30 @@ sub maybe_connected {
 	foreach my $opt (qw(serverImplementationId
 			    serverImplementationName
 			    serverImplementationVersion)) {
-	    $conn->record()->store_result($opt, value => $conn->option($opt));
+	    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
+	    # 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.
+	    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);
 	}
     }