X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=e918c0c6c711b7a09522ae023bf75bb043552d2c;hb=5b3c2c5e342c23fbab96b7573c5963344617878f;hp=44cb5728142df950fef391f8a31239fb8580c7b9;hpb=b463dee2efa3edb72fab9bf1c64364ea38408bec;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 44cb5728..e918c0c6 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -102,9 +102,6 @@ sub init mkdir "$dirprefix", 0777 if !-e "$dirprefix"; $fp = DXLog::new($dirprefix, "dat", 'd'); $statp = DXLog::new($dirprefix, "dys", 'd'); - my $rm = $main::is_win ? 'del' : 'rm -f'; - system("$rm $main::data/$dirprefix/*/*.bys"); - system("$rm $main::data/$dirprefix/*/*.cys"); } sub prefix @@ -123,10 +120,9 @@ sub prepare # remove ssids and /xxx if present on spotter $out[4] =~ s/-\d+$//o; - $out[4] =~ s|/\w+$||o; # remove leading and trailing spaces - $_[3] = unpad($_[3]); + unpad($out[3]); # add the 'dxcc' country on the end for both spotted and spotter, then the cluster call @@ -140,7 +136,7 @@ sub prepare sub add { - my $buf = join("\^", @_); + my $buf = join('^', @_); $fp->writeunix($_[2], $buf); $totalspots++; if ($_[0] <= 30000) {