fix here

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 276b346b64447a4d6efe2abf293b56439d1f5f21..753f59f79e4788e5211c77353c3d891de8b38789 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -37,6 +37,8 @@ use DB_File;
 use VE7CC;
 use Thingy;
 use Thingy::Dx;
+use Thingy::Hello;
+use Thingy::Bye;
 
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount $msgpolltime);
@@ -52,10 +54,8 @@ $msgpolltime = 3600;                 # the time between polls for new messages
 
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
 
 #
 # obtain a new connection this is derived from dxchannel
@@ -68,12 +68,11 @@ sub new
        # routing, this must go out here to prevent race condx
        my $pkg = shift;
        my $call = shift;
-       my @rout = $main::routeroot->add_user($call, Route::here(1));
+       my @rout = $main::routeroot->add_user($call, 1);
 
-       # ALWAYS output the user
+       
        my $ref = Route::User::get($call);
        $main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
-
        return $self;
 }
 
@@ -176,6 +175,11 @@ sub start
                $user->lastoper($main::systime + ((int rand(10)) * 86400));
        }
 
+       # ALWAYS output the user
+       my $thing = Thingy::Hello->new(user => $call, h => $self->{here});
+       $thing->broadcast($self);
+       $self->lasthello($main::systime);
+
        # run a script send the output to the punter
        my $script = new Script(lc $call) || new Script('user_default');
        $script->run($self) if $script;
@@ -496,7 +500,7 @@ sub run_cmd
 sub process
 {
        my $t = time;
-       my @dxchan = DXChannel->get_all();
+       my @dxchan = DXChannel::get_all();
        my $dxchan;
        
        foreach $dxchan (@dxchan) {
@@ -542,6 +546,9 @@ sub disconnect
 
                # issue a pc17 to everybody interested
                $main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
+
+               my $thing = Thingy::Bye->new(user=>$call);
+               $thing->broadcast($self);
        } else {
                confess "trying to disconnect a non existant user $call";
        }
@@ -584,7 +591,7 @@ sub broadcast
        my $pkg = shift;                        # ignored
        my $s = shift;                          # the line to be rebroadcast
        
-    foreach my $dxchan (DXChannel->get_all()) {
+    foreach my $dxchan (DXChannel::get_all()) {
                next unless $dxchan->{sort} eq 'U'; # only interested in user channels  
                next if grep $dxchan == $_, @_;
                $dxchan->send($s);                      # send it
@@ -594,7 +601,7 @@ sub broadcast
 # gimme all the users
 sub get_all
 {
-       return grep {$_->{sort} eq 'U'} DXChannel->get_all();
+       return grep {$_->{sort} eq 'U'} DXChannel::get_all();
 }
 
 # run a script for this user
@@ -846,66 +853,6 @@ sub chat
        $self->local_send('C', $buf);
 }
 
-sub format_dx_spot
-{
-       my $self = shift;
-       my $spot = ref $_[0] ? shift : \@_;
-       
-       my $t = ztime($spot->[2]);
-       my $loc = '';
-       my $clth = $self->{consort} eq 'local' ? 29 : 30;
-       my $comment = substr $spot->[3], 0, $clth; 
-       $comment .= ' ' x ($clth - length($comment));
-       if ($self->{user}->wantgrid) { 
-               my $ref = DXUser->get_current($spot->[4]);
-               if ($ref) {
-                       $loc = $ref->qra || '';
-                       $loc = ' ' . substr($loc, 0, 4) if $loc;
-               }
-       }
-
-       if ($self->{user}->wantdxitu) {
-               $loc = ' ' . sprintf("%2d", $spot->[10]) if defined $spot->[10];
-               $comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $spot->[8]) if defined $spot->[8]; 
-       } elsif ($self->{user}->wantdxcq) {
-               $loc = ' ' . sprintf("%2d", $spot->[11]) if defined $spot->[11];
-               $comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $spot->[9]) if defined $spot->[9]; 
-       } elsif ($self->{user}->wantusstate) {
-               $loc = ' ' . $spot->[13] if $spot->[13];
-               $comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . $spot->[12] if $spot->[12]; 
-       }
-
-       return sprintf "DX de %-7.7s%11.1f  %-12.12s %-s $t$loc", "$spot->[4]:", $spot->[0], $spot->[1], $comment;
-}
-
-# send a dx spot
-sub dx_spot
-{
-       my $self = shift;
-       my $line = shift;
-       my $isolate = shift;
-       return unless $self->{dx};
-
-       my ($filter, $hops);
-
-       if ($self->{spotsfilter}) {
-               ($filter, $hops) = $self->{spotsfilter}->it(@_ );
-               return unless $filter;
-       }
-
-       dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
-
-       my $buf;
-       if ($self->{ve7cc}) {
-               $buf = VE7CC::dx_spot($self, @_);
-       } else {
-               $buf = $self->format_dx_spot(@_);
-               $buf .= "\a\a" if $self->{beep};
-               $buf =~ s/\%5E/^/g;
-       }
-
-       $self->local_send('X', $buf);
-}
 
 sub wwv
 {
@@ -950,7 +897,7 @@ sub broadcast_debug
 {
        my $s = shift;                          # the line to be rebroadcast
        
-       foreach my $dxchan (DXChannel->get_all) {
+       foreach my $dxchan (DXChannel::get_all) {
                next unless $dxchan->{enhanced} && $dxchan->{senddbg};
                $dxchan->send_later('L', $s);
        }