X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fclear%2Fspots.pl;h=f630eb54c914718a2504b99d7c9eefbd00600734;hb=17d726014561756adf9fa40a68940bcd88e5f7b3;hp=bdce5c86fc89e5604cf2385b098bb73d067325d6;hpb=211b54d504170a8c9dad2bf25b9ed686d5eeac11;p=spider.git

diff --git a/cmd/clear/spots.pl b/cmd/clear/spots.pl
index bdce5c86..f630eb54 100644
--- a/cmd/clear/spots.pl
+++ b/cmd/clear/spots.pl
@@ -3,33 +3,35 @@
 #
 # Copyright (c) 2000 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 my ($self, $line) = @_;
 my @f = split /\s+/, $line;
 my @out;
-my $dxchan = $self;
 my $sort = 'spots';
 my $flag;
 my $fno = 1;
-my $call = $dxchan->call;
+my $call = $self->call;
+my $f;
 
-my $f = lc shift @f if @f;
 if ($self->priv >= 8) {
-	my $uref = DXUser->get(uc $f);
-	$call = $uref->call if $uref;
-	$f = undef;
-	$f = lc shift @f if @f;
-	if ($f && $f eq 'input') {
+	if (@f && is_callsign(uc $f[0])) {
+		$f = uc shift @f;
+		my $uref = DXUser::get_current($f);
+		$call = $uref->call if $uref;
+	} elsif (@f && lc $f[0] eq 'node_default' || lc $f[0] eq 'user_default') {
+		$call = lc shift @f;
+	}
+	if (@f && $f[0] eq 'input') {
+		shift @f;
 		$flag = 'in';
-		$f = undef;
-		$f = lc shift @f if @f;
 	}
 }
 
-$fno = $f if $f;
+$fno = shift @f if @f && $f[0] =~ /^\d|all$/;
+
 my $filter = Filter::read_in($sort, $call, $flag);
-Filter::delete($sort, $call, $flag, $fno);
+Filter::delete($sort, $call, $flag, $fno, $self);
 $flag = $flag ? "input " : "";
 push @out, $self->msg('filter4', $flag, $sort, $fno, $call);
 return (1, @out);