=================================================================== RCS file: /cvs/trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm,v retrieving revision 1.43 retrieving revision 1.45 diff -u -r1.43 -r1.45 --- trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm 2007/05/21 21:45:48 1.43 +++ trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm 2008/02/08 16:49:09 1.45 @@ -1,6 +1,6 @@ package Net::Telnet::Trango; -# $RedRiver: Trango.pm,v 1.42 2007/05/21 20:24:13 andrew Exp $ +# $RedRiver: Trango.pm,v 1.44 2007/06/05 19:54:05 mike Exp $ use strict; use warnings; use base 'Net::Telnet'; @@ -322,7 +322,7 @@ my $success = 'Success\\.'; my %COMMANDS = ( - _clear => { decode => 'all', String => '', args => '' }, + _clear => { String => "\n" }, tftpd => { decode => 'all', expect => $success }, ver => { decode => 'all' }, sysinfo => { decode => 'all', expect => $success }, @@ -343,6 +343,7 @@ { String => 'su testrflink', decode => 'each', expect => $success }, save_ss => { String => 'save ss', expect => $success }, opmode => { decode => 'all', expect => $success }, + arq => { decode => 'all' }, ); my %ALIASES = ( @@ -893,6 +894,7 @@ $cmd{'String'} .= $SPACE . $cfg{'args'}; } + #print "Running cmd $cmd{String}\n"; my @lines; if ( $cfg{'no_prompt'} ) { $self->print( $cmd{'String'} ); @@ -951,7 +953,6 @@ $self->last_error($err->{ERR} ); } else { $self->last_error("Error with command ($cmd{'String'}): $last"); - $self->_clear(); } return; } @@ -1064,6 +1065,32 @@ push @decoded, $decoded if defined $decoded; } return \@decoded; +} + +#=item _decode_linktest + +sub _decode_linktest { + my @lines = @_; + my %decoded; + foreach my $line (@lines) { + + if ($line =~ s/^(\d+) \s*//xms) { + my $line_id = $1; + my $d = _decode_lines($line . "\n"); + $decoded{tests}[$line_id] = $d; + } + + else { + my $d = _decode_lines($line . "\n"); + if ($d) { + while (my ($k, $v) = each %{ $d }) { + $decoded{$k} = $v; + } + } + } + + } + return \%decoded; } #=item _decode_sulog