===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm,v
retrieving revision 1.48
retrieving revision 1.56
diff -u -r1.48 -r1.56
--- 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	2009/07/08 18:16:41	1.56
@@ -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.55 2009/07/08 17:00:55 andrew Exp $
 use strict;
 use warnings;
 use base 'Net::Telnet';
@@ -43,7 +43,7 @@
 
 =cut
 
-our $VERSION = '0.01';
+our $VERSION = '0.02';
 
 my $EMPTY = q{};
 my $SPACE = q{ };
@@ -61,7 +61,7 @@
         [Decode => 0,]);
 
 Same as new from L<Net::Telnet> but sets the default Trango Prompt: 
-'/#> *$/'
+'/[\$#]>\s*\Z/'
 
 It also takes an optional parameter 'Decode'.  If not defined it
 defaults to 1, if it is set to 0, it will not decode the output and
@@ -81,7 +81,7 @@
         %args = @_;
     }
 
-    $args{'Prompt'} ||= '/#> *$/';
+    $args{'Prompt'} ||= '/[\$#]>\s*\r?\n?$/';
 
     foreach my $key ( keys %args ) {
         $PRIVATE{$key} = $args{$key};
@@ -493,7 +493,7 @@
 
     my ( $type, $sep1, $subtype, $sep2, $ver ) =
       $banner =~
-      /Welcome to Trango Broadband Wireless (\S+)([\s-]+)(\S+)([\s-]+)(.+)$/i;
+      /Welcome to Trango Broadband Wireless,? (\S+)([\s-]+)(\S+)([\s-]+)(.+)$/i;
 
     $type .= $sep1 . $subtype;
     $ver = $subtype . $sep2 . $ver;
@@ -704,7 +704,7 @@
     }
 
     my $new_mac = $mac;
-    $new_mac =~ s/[^0-9A-Fa-f]//;
+    $new_mac =~ s/[^0-9A-Fa-f]//g;
     unless ( length $new_mac == 12 ) {
         $self->last_error("Invalid MAC '$mac'");
         return;
@@ -942,6 +942,16 @@
 
     $self->last_lines( \@lines );
 
+    my $last = $self->lastline;
+    my $prompt = $self->prompt;
+    $prompt =~ s{^/}{}xms;
+    $prompt =~ s{/[gixms]*$}{}xms;
+    while (@lines && $last =~ qr($prompt)) {
+        pop @lines;
+        $last = $lines[-1];
+    }
+    $self->last_error($EMPTY);
+
     my $vals = 1;
     if ( $PRIVATE{'Decode'} && $cfg{'decode'} ) {
         if ( $cfg{'decode'} eq 'each' ) {
@@ -966,12 +976,8 @@
             $vals = _decode_lines(@lines);
         }
     }
-
     $self->last_vals($vals);
 
-    my $last = $self->lastline;
-    $self->last_error($EMPTY);
-
     if ( ( not $cfg{'expect'} ) || $last =~ /$cfg{'expect'}$/ ) {
         if ( $cfg{'cmd_disconnects'} ) {
             $self->logged_in(0);
@@ -1014,9 +1020,50 @@
     my $in_key = 0;
     my $in_val = 1;
 
-    foreach my $line (@lines) {
-        next if $line =~ /$success$/;
+    LINE: while (my $line = shift @lines) {
+        next LINE if $line =~ /$success\Z/;
+        next LINE if $line =~ /^ \*+ \s+ \d+ \s+ \*+ \Z/xms;
 
+        # Special decode for sysinfo on a TrangoLink 45
+        if ($line =~ /^(.* Channel \s+ Table):\s*(.*)\Z/xms) {
+            my $key  = $1;
+            my $note = $2;
+
+            my %vals;
+            while ($line = shift @lines) {
+                if ($line =~ /^\Z/) {
+                    $conf{$key} = \%vals;
+                    $conf{$key}{note} = $note;
+                    next LINE;
+                }
+
+                my $decoded = _decode_lines($line);
+                if ($decoded) {
+                    %vals = (%vals, %{ $decoded });
+                }
+            }
+        }
+        # Another special decode for the TrangoLink
+        elsif ($line =~ /^
+            RF \s Band \s \# 
+            (\d+) \s+ 
+            \( ([^\)]+) \) \s*
+            (.*)$
+        /xms) {
+            my $num   = $1;
+            my $band  = $2;
+            my $extra = $3;
+
+            if ($extra =~ /\[/) {
+                my $decoded = _decode_lines($extra);
+                $conf{'RF Band'}{$num} = $decoded;
+            }
+            else {
+                $conf{'RF Band'}{$num}{$extra} = 1;
+            }
+            next LINE;
+        }
+
         my @chars = split //, $line;
 
         my $last_key = $EMPTY;
@@ -1117,12 +1164,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+) \s* $//xms) {
+				$rt = $1;
+			}
+			if ($line =~ s/\s+ (\d+ \s+ \w+) \s* $//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 {