sort out the filtering system

[spider.git] / perl / console.pl

diff --git a/perl/console.pl b/perl/console.pl
index c47b5076e60f5d995ad1844508e5378c9b89438c..b919d07660cf9ca95d7abf13bee2fb64b8027659 100755 (executable)
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -29,12 +29,16 @@ our $foreground;
 our $background;
 our $mycallcolor;
 our @colors;
+our $data;
+our $local_data;
 
 # search local then perl directories
 BEGIN {
        # root of directory tree for this system
        $root = "/spider"; 
        $root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
+       $local_data = "$root/local_data";
+       $data = "$root/data";
        
        unshift @INC, "$root/perl";     # this IS the right way round!
        unshift @INC, "$root/local";
@@ -76,7 +80,6 @@ our @kh = ();
 our @sh = ();
 our $kpos = 0;
 our $inbuf = "";
-our $lastmin = 0;
 our $idle = 0;
 our $inscroll = 0;
 
@@ -503,6 +506,7 @@ sub rec_socket
        $lasttime = time; 
 }
 
+my $lastmin = 0;
 
 sub idle_loop
 {
@@ -589,9 +593,6 @@ doresize();
 
 $SIG{__DIE__} = \&sig_term;
 
-my $lastmin = 0;
-
-
 $conn = IntMsg->connect($clusteraddr, $clusterport, rproc => \&rec_socket);
 $conn->{on_connect} = \&on_connect;
 $conn->{on_disconnect} = \&on_disconnect;