X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=aa6f743d39d3657546cee962364193c26b4ac044;hb=290cd395e4bac4a92dfc3c40a2a3fd7de93110eb;hp=fe5a484295f7bc9c0a9948946dfa362559e11506;hpb=7505989c04f2d3ff01ca126407c1dcd17e4bc62b;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index fe5a4842..aa6f743d 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -31,7 +31,9 @@ use WCY;
 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);
@@ -47,7 +49,7 @@ $maxbadcount = 3;				# no of bad words allowed before disconnection
 
 use vars qw($VERSION $BRANCH);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -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;
 }
@@ -109,6 +111,11 @@ sub start
 	$self->{here} = 1;
 	$self->{prompt} = $user->prompt if $user->prompt;
 
+	# sort out new dx spot stuff
+	$user->wantdxcq(0) unless defined $user->{wantdxcq};
+	$user->wantdxitu(0) unless defined $user->{wantdxitu};	
+	$user->wantusstate(0) unless defined $user->{wantusstate};
+
 	# sort out registration
 	if ($main::reqreg == 1) {
 		$self->{registered} = $user->registered;
@@ -470,7 +477,7 @@ sub run_cmd
 			return ();
 		}
 	}
-	return (@ans);
+	return map {s/([^\s])\s+$/$1/; $_} @ans;
 }
 
 #
@@ -519,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";
 	}
@@ -797,6 +804,56 @@ sub announce
 	$self->local_send($target eq 'WX' ? 'W' : 'N', $buf);
 }
 
+# send a chat
+sub chat
+{
+	my $self = shift;
+	my $line = shift;
+	my $isolate = shift;
+	my $target = shift;
+	my $to = shift;
+	my $text = shift;
+	my ($filter, $hops);
+
+	return unless grep uc $_ eq $target, @{$self->{user}->{group}};
+	
+	$text =~ s/^\#\d+ //;
+	my $buf = "$target de $_[0]: $text";
+	$buf =~ s/\%5E/^/g;
+	$buf .= "\a\a" if $self->{beep};
+	$self->local_send('C', $buf);
+}
+
+sub format_dx_spot
+{
+	my $self = shift;
+
+	my $t = ztime($_[2]);
+	my $loc;
+	my $clth = $self->{consort} eq 'local' ? 29 : 30;
+	my $comment = substr $_[3], 0, $clth; 
+	$comment .= ' ' x ($clth - length($comment));
+	my $ref = DXUser->get_current($_[4]);
+	if ($ref) {
+		$loc = $ref->qra || '' if $self->{user}->wantgrid; 
+		$loc = ' ' . substr($loc, 0, 4) if $loc;
+	} 
+	$loc = "" unless $loc;
+
+	if ($self->{user}->wantdxitu) {
+		$loc = ' ' . sprintf("%2d", $_[10]) if defined $_[10];
+		$comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[8]) if defined $_[8]; 
+	} elsif ($self->{user}->wantdxcq) {
+		$loc = ' ' . sprintf("%2d", $_[11]) if defined $_[11];
+		$comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[9]) if defined $_[9]; 
+	} elsif ($self->{user}->wantusstate) {
+		$loc = ' ' . $_[13] if $_[13];
+		$comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . $_[12] if $_[12]; 
+	}
+
+	return sprintf "DX de %-7.7s%11.1f  %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
+}
+
 # send a dx spot
 sub dx_spot
 {
@@ -812,13 +869,9 @@ sub dx_spot
 		return unless $filter;
 	}
 
-
-	my $t = ztime($_[2]);
-	my $ref = DXUser->get_current($_[4]);
-	my $loc = $ref->qra if $ref && $ref->qra && $self->{user}->wantgrid;
-	$loc = ' ' . substr($loc, 0, 4) if $loc;
-	$loc = "" unless $loc;
-	my $buf = sprintf "DX de %-7.7s%11.1f  %-12.12s %-*s $t$loc", "$_[4]:", $_[0], $_[1], $self->{consort} eq 'local' ? 29 : 30, $_[3];
+	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);