X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=aa6f743d39d3657546cee962364193c26b4ac044;hb=17e88d739dbfcab7c690a071f9f5470a354f2011;hp=42c80b533e63bc737c0d6e56caeedfbdf8590a45;hpb=e07645cec07ba739a20cc009d7dd138c962b66eb;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 42c80b53..aa6f743d 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -68,7 +68,7 @@ sub new
 
 	# ALWAYS output the user
 	my $ref = Route::User::get($call);
-	DXProt::route_pc16($main::me, $main::routeroot, $ref) if $ref;
+	$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
 
 	return $self;
 }
@@ -526,7 +526,7 @@ sub disconnect
 		dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
 
 		# issue a pc17 to everybody interested
-		DXProt::route_pc17($main::me, $main::routeroot, $uref);
+		$main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
 	} else {
 		confess "trying to disconnect a non existant user $call";
 	}
@@ -824,24 +824,10 @@ sub chat
 	$self->local_send('C', $buf);
 }
 
-# send a dx spot
-sub dx_spot
+sub format_dx_spot
 {
 	my $self = shift;
-	my $line = shift;
-	my $isolate = shift;
-	my ($filter, $hops);
 
-	return unless $self->{dx};
-	
-	if ($self->{spotsfilter}) {
-		($filter, $hops) = $self->{spotsfilter}->it(@_ );
-		return unless $filter;
-	}
-
-
-	dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
-	
 	my $t = ztime($_[2]);
 	my $loc;
 	my $clth = $self->{consort} eq 'local' ? 29 : 30;
@@ -865,8 +851,27 @@ sub dx_spot
 		$comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . $_[12] if $_[12]; 
 	}
 
-	my $buf = sprintf "DX de %-7.7s%11.1f  %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
+	return sprintf "DX de %-7.7s%11.1f  %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
+}
+
+# send a dx spot
+sub dx_spot
+{
+	my $self = shift;
+	my $line = shift;
+	my $isolate = shift;
+	my ($filter, $hops);
+
+	return unless $self->{dx};
+	
+	if ($self->{spotsfilter}) {
+		($filter, $hops) = $self->{spotsfilter}->it(@_ );
+		return unless $filter;
+	}
+
+	dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
 	
+	my $buf = $self->format_dx_spot(@_);
 	$buf .= "\a\a" if $self->{beep};
 	$buf =~ s/\%5E/^/g;
 	$self->local_send('X', $buf);