From: minima <minima>
Date: Sun, 5 Nov 2000 12:41:51 +0000 (+0000)
Subject: and again
X-Git-Tag: R_1_45~39
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3ba1b48202f7053b4d1097525dc0a660c3f9b31a;p=spider.git

and again
---

diff --git a/cmd/clear/spots.pl b/cmd/clear/spots.pl
index 28c2a4a4..d2a59bc0 100644
--- a/cmd/clear/spots.pl
+++ b/cmd/clear/spots.pl
@@ -6,30 +6,29 @@
 # $Id$
 #
 my ($self, $line) = @_;
-my @f = split /\s+/, $line;
+my @f = split(/\s+/, $line);
 my @out;
 my $dxchan = $self;
 my $sort = 'spots';
 my $flag;
 my $fno = 1;
 my $call = $dxchan->call;
+my $f;
 
-my $f = lc shift @f if @f;
 if ($self->priv >= 8) {
-	if (is_callsign(uc $f)) {
-		my $uref = DXUser->get(uc $f);
+	if (is_callsign(uc $f[0])) {
+		$f = uc shift @f;
+		my $uref = DXUser->get($f);
 		$call = $uref->call if $uref;
 	}
-	if (@f) {
-		$f = lc shift @f;
-		if ($f eq 'input') {
-			$flag = 'in';
-			$f = shift @f if @f;
-		}
+	if ($f[0] eq 'input') {
+		shift @f;
+		$flag = 'in';
 	}
 }
 
-$fno = $f if $f;
+$fno = shift @f if @f && $f[0] =~ /^\d$/;
+
 my $filter = Filter::read_in($sort, $call, $flag);
 Filter::delete($sort, $call, $flag, $fno);
 $flag = $flag ? "input " : "";
diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 72d65cb3..4477ea75 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -302,7 +302,7 @@ sub run_cmd
 		
 		# split the command line up into parts, the first part is the command
 		my ($cmd, $args) = split /\s+/, $cmdline, 2;
-		$args = "" unless $args;
+		$args = "" unless defined $args;
 		
 		if ($cmd) {
 			
@@ -314,7 +314,7 @@ sub run_cmd
 			my $acmd = CmdAlias::get_cmd($cmd);
 			if ($acmd) {
 				($cmd, $args) = split /\s+/, "$acmd $args", 2;
-				$args = "" unless $args;
+				$args = "" unless defined $args;
 				dbg('command', "aliased cmd: $cmd $args");
 			}
 			
diff --git a/perl/Spot.pm b/perl/Spot.pm
index 74e4e27a..67d8a658 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -30,6 +30,7 @@ $dupage = 3*3600;               # the length of time to hold spot dups
 $filterdef = bless ([
 			  # tag, sort, field, priv, special parser 
 			  ['freq', 'r', 0, 0, \&decodefreq],
+			  ['on', 'r', 0, 0, \&decodefreq],
 			  ['call', 'c', 1],
 			  ['info', 't', 3],
 			  ['by', 'c', 4],