X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=9f3c669e26922e39a7118170887048e27ff51f30;hb=d2c1a8cb2a31725e3b9084aee3ec43e585e3273f;hp=96c135376495fbbb0747f64b7ee996ae4657bfdb;hpb=8f58735f5c9c090f2e5e00e05c7ad0834eccb741;p=spider.git diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index 96c13537..9f3c669e 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -120,16 +120,6 @@ sub start $user->qra(DXBearing::lltoqra($lat, $long)) if (defined $lat && defined $long); } - # send prompts and things - my $info = Route::cluster(); - $self->send("Cluster:$info"); - $self->send($self->msg('namee1')) if !$user->name; - $self->send($self->msg('qthe1')) if !$user->qth; - $self->send($self->msg('qll')) if !$user->qra || (!$user->lat && !$user->long); - $self->send($self->msg('hnodee1')) if !$user->qth; - $self->send($self->msg('m9')) if DXMsg::for_me($call); - $self->prompt; - # decide on echo if (!$user->wantecho) { $self->send_now('E', "0"); @@ -147,8 +137,20 @@ sub start } # run a script send the output to the punter - my $script = new Script(lc $call); + my $script = new Script(lc $call) || new Script('user_default'); $script->run($self) if $script; + + # send cluster info + my $info = Route::cluster(); + $self->send("Cluster:$info"); + + # send prompts and things + $self->send($self->msg('namee1')) if !$user->name; + $self->send($self->msg('qthe1')) if !$user->qth; + $self->send($self->msg('qll')) if !$user->qra || (!$user->lat && !$user->long); + $self->send($self->msg('hnodee1')) if !$user->qth; + $self->send($self->msg('m9')) if DXMsg::for_me($call); + $self->prompt; } #