From: minima <minima>
Date: Mon, 21 Mar 2005 19:47:06 +0000 (+0000)
Subject: fix command searching
X-Git-Tag: R_1_52~77
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e266b6c9d500dde73cf0025a63a8032ea1cf378d;p=spider.git

fix command searching
---

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 9b3b09e3..95039af6 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -642,32 +642,33 @@ sub search
 	my @parts = split '/', $short_cmd;
 	my $dirfn;
 	my $curdir = $path;
-	my $p;
-	my $i;
-	my @lparts;
 	
-	for ($i = 0; $i < @parts; $i++) {
-		my  $p = $parts[$i];
+	while (my $p = shift @parts) {
 		opendir(D, $curdir) or confess "can't open $curdir $!";
 		my @ls = readdir D;
 		closedir D;
-		my $l;
-		foreach $l (sort @ls) {
-			next if $l =~ /^\./;
-			if ($i < $#parts) {            	# we are dealing with directories
+
+		# if this isn't the last part
+		if (@parts) {
+			my $found;
+			foreach my $l (sort @ls) {
+				next if $l =~ /^\./;
 				if ((-d "$curdir/$l") && $p eq substr($l, 0, length $p)) {
 					dbg("got dir: $curdir/$l\n") if isdbg('command');
 					$dirfn .= "$l/";
 					$curdir .= "/$l";
+					$found++;
 					last;
 				}
-			} else {			# we are dealing with commands
-				@lparts = split /\./, $l;                  
-				next if $lparts[$#lparts] ne $suffix;        # only look for .$suffix files
+			}
+			# only proceed if we find the directory asked for
+			return () unless $found;
+		} else {
+			foreach my $l (sort @ls) {
+				next if $l =~ /^\./;
+				next unless $l =~ /\.$suffix$/;
 				if ($p eq substr($l, 0, length $p)) {
-					pop @lparts; #  remove the suffix
-					$l = join '.', @lparts;
-					#		  chop $dirfn;               # remove trailing /
+					$l =~ s/\.$suffix$//;
 					$dirfn = "" unless $dirfn;
 					$cmd_cache{$short_cmd} = join(',', ($path, "$dirfn$l")); # cache it
 					dbg("got path: $path cmd: $dirfn$l\n") if isdbg('command');
diff --git a/perl/Spot.pm b/perl/Spot.pm
index 7f9139cf..306bc282 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -361,7 +361,7 @@ sub dup
 	$d = int ($d / 60);
 	$d *= 60;
 
-	$by =~ s/-\d+$//g;
+	$by =~ s|[-/]\d+$||;
 	
 	$freq = sprintf "%.1f", $freq;       # normalise frequency
 	$call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth;