X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=ac141b363cd0942462f6f0634fc17a5852117869;hb=0e1727bfb23ddea7bc272776b5b5c4f9c432e65f;hp=5a53dc6e117fe291216fd36ffc8c350a7ec118d6;hpb=e74346e7fcfcf7b825534727904adf57425aadd1;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 5a53dc6e..ac141b36 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -32,6 +32,8 @@ use Sun;
 use Internet;
 use Script;
 use Net::Telnet;
+use QSL;
+use DB_File;
 
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount);
@@ -66,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;
 }
@@ -416,15 +418,14 @@ sub run_cmd
 
 	return () if length $cmdline == 0;
 		
-	# strip out //
-	$cmdline =~ s|//|/|og;
-		
 	# split the command line up into parts, the first part is the command
 	my ($cmd, $args) = split /\s+/, $cmdline, 2;
 	$args = "" unless defined $args;
 		
 	if ($cmd) {
-			
+		# strip out // on command only
+		$cmd =~ s|//|/|g;
+					
 		my ($path, $fcmd);
 			
 		dbg("cmd: $cmd") if isdbg('command');
@@ -524,7 +525,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";
 	}
@@ -808,38 +809,24 @@ sub chat
 	my $self = shift;
 	my $line = shift;
 	my $isolate = shift;
-	my $to = shift;
 	my $target = shift;
+	my $to = shift;
 	my $text = shift;
 	my ($filter, $hops);
 
-	return unless grep uc $_ eq $to, @{$self->{user}->{group}};
+	return unless grep uc $_ eq $target, @{$self->{user}->{group}};
 	
 	$text =~ s/^\#\d+ //;
-	my $buf = "$to de $_[0]: $text";
+	my $buf = "$target de $_[0]: $text";
 	$buf =~ s/\%5E/^/g;
 	$buf .= "\a\a" if $self->{beep};
 	$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;
@@ -863,8 +850,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);