===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm	2008/02/18 16:37:35	1.51
+++ trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm	2008/02/18 19:13:32	1.52
@@ -1,6 +1,6 @@
 package Net::Telnet::Trango;
 
-# $RedRiver: Trango.pm,v 1.50 2008/02/08 19:32:15 andrew Exp $
+# $RedRiver: Trango.pm,v 1.51 2008/02/18 16:37:35 andrew Exp $
 use strict;
 use warnings;
 use base 'Net::Telnet';
@@ -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};
@@ -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,8 +1020,49 @@
     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;