put in input filter for ann and output filters for ann/wwv/spots

[spider.git] / perl / Console.pm

diff --git a/perl/Console.pm b/perl/Console.pm
index 7e3015f9beccf5a780b78ea0ce422acc986979c5..494392a7b86b2aa6d98307812c150acca6abeb46 100644 (file)
--- a/perl/Console.pm
+++ b/perl/Console.pm
@@ -29,8 +29,9 @@ if ($ENV{'TERM'} =~ /(xterm|ansi)/) {
        $ENV{'TERM'} = 'color_xterm';
        $foreground = COLOR_BLACK();
        $background = COLOR_WHITE();
+       $mycallcolor = COLOR_PAIR(1);
        @colors = (
-                  [ '^DX de [\-A-Z0-9]+:\s+(14[45]\d\d\d|5[01]\d\d\d)', COLOR_PAIR(1) ],
+                  [ '^DX de [\-A-Z0-9]+:\s+([57][01]\d\d\d\.|\d\d\d\d\d\d+.)', COLOR_PAIR(1) ],
                   [ '^DX', COLOR_PAIR(5) ],
                   [ '^To', COLOR_PAIR(3) ],
                   [ '^WWV', COLOR_PAIR(4) ],
@@ -43,11 +44,12 @@ if ($ENV{'TERM'} =~ /(xterm|ansi)/) {
 if ($ENV{'TERM'} =~ /(console|linux)/) {
        $foreground = COLOR_WHITE();
        $background = COLOR_BLACK();
+       $mycallcolor = COLOR_PAIR(1);
        @colors = (
-                  [ '^DX de [\-\w]+:\s+(14[45]\d\d\d|5[01]\d\d\d)', COLOR_PAIR(1) ],
-                  [ '^DX', COLOR_PAIR(5) ],
+                  [ '^DX de [\-A-Z0-9]+:\s+([57][01]\d\d\d\.|\d\d\d\d\d\d+.)', COLOR_PAIR(1) ],
+                  [ '^DX', COLOR_PAIR(4) ],
                   [ '^To', COLOR_PAIR(3) ],
-                  [ '^WWV', COLOR_PAIR(4) ],
+                  [ '^WWV', COLOR_PAIR(5) ],
                   [ '^[-A-Z0-9]+ de [-A-Z0-9]+ \d\d-\w\w\w-\d\d\d\d \d\d\d\dZ', COLOR_PAIR(0) ],
                   [ '^[-A-Z0-9]+ de [-A-Z0-9]+ ', COLOR_PAIR(6) ],
                   [ '^WX', COLOR_PAIR(3) ],