hamradio/spider
1
0
Fork 0
mirror of git://scm.dxcluster.org/scm/spider synced 2024-09-21 15:57:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix sh/dx properly both for freq range and adding a . to the end of

Browse Source 
a freq so it doesn't match any times.
This commit is contained in:
minima 2000-12-05 14:30:37 +00:00
parent ce732002f6
commit 1a882ec013
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/show/dx.pl
View File

@ -101,7 +101,7 @@ if (@freq) {
for ($i = 0; $i < @freq; $i += 2) {
$expr .= "(\$f0 >= $freq[$i] && \$f0 <= $freq[$i+1]) ||";
my $r = Spot::ftor($freq[$i], $freq[$i+1]);
$hint .= "m{$r} ||" if $r;
$hint .= "m{$r\\.} ||" if $r;
}
chop $expr; chop $expr;
chop $hint; chop $hint;

5
perl/Spot.pm
View File

@ -230,6 +230,7 @@ sub ftor
my ($a, $b) = @_;
return undef unless $a < $b;
$b--;
my $d = $b - $a;
my @a = split //, $a;
my @b = split //, $b;
my $out;
@ -239,7 +240,9 @@ sub ftor
while (@b) {
my $aa = shift @a;
my $bb = shift @b;
if ($aa eq $bb) {
if (@b < (length $d) - 1) {
$out .= '\\d';
} elsif ($aa eq $bb) {
$out .= $aa;
} elsif ($aa < $bb) {
$out .= "[$aa-$bb]";