put duplicate checking into respective modules and out of DXProt.

[spider.git] / perl / console.pl

diff --git a/perl/console.pl b/perl/console.pl
index 8f028aa7ab9d7e8b2e9bde85e2386b1f66b8caf0..35e5da7e9bf339aebf3f26e209e6f9e9b262850e 100755 (executable)
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -32,8 +32,6 @@ use DXUtil;
 use IO::File;
 use Curses;
 
-use Carp qw{cluck};
-
 use Console;
 
 #
@@ -68,6 +66,14 @@ sub do_initscr
                init_pair(4, COLOR_CYAN, $background);
                init_pair(5, COLOR_BLUE, $background);
                init_pair(6, COLOR_MAGENTA, $background);
+               init_pair(7, COLOR_RED, COLOR_BLUE);
+               init_pair(8, COLOR_YELLOW, COLOR_BLUE);
+               init_pair(9, COLOR_GREEN, COLOR_BLUE);
+               init_pair(10, COLOR_CYAN, COLOR_BLUE);
+               init_pair(11, COLOR_BLUE, COLOR_RED);
+               init_pair(12, COLOR_MAGENTA, COLOR_BLUE);
+               init_pair(13, COLOR_YELLOW, COLOR_GREEN);
+               init_pair(14, COLOR_RED, COLOR_GREEN);
        }
        
        $top = $scr->subwin(LINES()-4, COLS, 0, 0);
@@ -96,7 +102,7 @@ sub cease
 {
        my $sendz = shift;
        if ($conn && $sendz) {
-               $conn->send_now("Z$call|bye...\n");
+               $conn->send_now("Z$call|bye...");
        }
        endwin();
        dbgclose();
@@ -208,13 +214,18 @@ sub rec_socket
                cease(1);
        }
        if (defined $msg) {
-               my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
+               my ($sort, $call, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/;
                
                if ($sort && $sort eq 'D') {
                        addtotop($line);
                } elsif ($sort && $sort eq 'Z') { # end, disconnect, go, away .....
                        cease(0);
                }         
+               # ******************************************************
+               # ******************************************************
+               # any other sorts that might happen are silently ignored.
+               # ******************************************************
+               # ******************************************************
        }
        $top->refresh();
        $lasttime = time; 
@@ -394,6 +405,12 @@ sub rec_stdin
 
 $call = uc shift @ARGV if @ARGV;
 $call = uc $myalias if !$call;
+my ($scall, $ssid) = split /-/, $call;
+$ssid = undef unless $ssid && $ssid =~ /^\d+$/;  
+if ($ssid) {
+       $ssid = 15 if $ssid > 15;
+       $call = "$scall-$ssid";
+}
 
 if ($call eq $mycall) {
        print "You cannot connect as your cluster callsign ($mycall)\n";
@@ -418,15 +435,15 @@ if (! $conn) {
 $SIG{'INT'} = \&sig_term;
 $SIG{'TERM'} = \&sig_term;
 #$SIG{'WINCH'} = \&do_resize;
-$SIG{'HUP'} = 'IGNORE';
+$SIG{'HUP'} = \&sig_term;
 
 do_initscr();
 
 $SIG{__DIE__} = \&sig_term;
 
-$conn->send_now("A$call|$connsort");
-$conn->send_now("I$call|set/page $maxshist");
-$conn->send_now("I$call|set/nobeep");
+$conn->send_later("A$call|$connsort");
+$conn->send_later("I$call|set/page $maxshist");
+$conn->send_later("I$call|set/nobeep");
 
 Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin);