=================================================================== RCS file: /cvs/trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm 2008/02/08 18:49:41 1.48 +++ trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm 2008/02/08 19:29:05 1.49 @@ -1,6 +1,6 @@ package Net::Telnet::Trango; -# $RedRiver: Trango.pm,v 1.47 2008/02/08 17:40:00 andrew Exp $ +# $RedRiver: Trango.pm,v 1.48 2008/02/08 18:49:41 andrew Exp $ use strict; use warnings; use base 'Net::Telnet'; @@ -1117,12 +1117,20 @@ my %decoded; foreach my $line (@lines) { - if ($line =~ /^(\d+) \s+ (.*) \s+ (\d+ \s+ \w+) \s+ (\d+ \s+ \w+) $/xms) { + if ($line =~ s/^(\d+) \s+ //xms) { my $line_id = $1; - my $d = _decode_lines($2. "\n"); + my ($tm, $rt); + if ($line =~ s/\s+ (\d+ \s+ \w+) $//xms) { + $rt = $1; + } + if ($line =~ s/\s+ (\d+ \s+ \w+) $//xms) { + $tm = $1; + } + + my $d = _decode_lines($line. "\n"); $decoded{tests}[$line_id] = $d; - $decoded{tests}[$line_id]{'time'} = $3; - $decoded{tests}[$line_id]{rate} = $4; + $decoded{tests}[$line_id]{'time'} = $tm; + $decoded{tests}[$line_id]{rate} = $rt; } else {