if (lc $f eq 'on' && $list[0]) { # is it freq range?
# print "yup freq\n";
my @r = split '/', $list[0];
- # print "r0: $r[0] r1: $r[1]\n";
- @freq = Bands::get_freq($r[0], $r[1]);
- if (@freq) { # yup, get rid of extranous param
- # print "freq: ", join(',', @freq), "\n";
+ # print "r0: $r[0] r1: $r[1]\n";
+ my @fr = Bands::get_freq($r[0], $r[1]);
+ if (@fr) { # yup, get rid of extranous param
+ # print "freq: ", join(',', @fr), "\n";
shift @list;
+ push @freq, @fr; # add these to the list
next;
}
}
$info = shift @list;
next;
}
- if (lc $f eq 'spotter' && $list[0]) {
+ if ((lc $f eq 'spotter' || lc $f eq 'by') && $list[0]) {
# print "got spotter\n";
$spotter = uc shift @list;
next;
# first deal with the prefix
if ($pre) {
- $expr = "\$f1 =~ /";
- $pre =~ s|/|\\/|; # change the slashes to \/
- if ($pre =~ /^\*/o) {
- $pre =~ s/^\*//;;
- $expr .= "$pre\$/o";
- } else {
- $expr .= "^$pre/o";
- }
+ $pre .= '*' unless $pre =~ /[\*\?\[]/o;
+ $pre = shellregex($pre);
+ $expr = "\$f1 =~ m{$pre}o";
} else {
$expr = "1"; # match anything
}
# any info
if ($info) {
$expr .= " && " if $expr;
- $info =~ s|/|\\/|;
- $expr .= "\$f3 =~ /$info/io";
+ $info =~ s{(.)}{"\Q$1"}ge;
+ $expr .= "\$f3 =~ m{$info}io";
}
# any spotter
if ($spotter) {
$expr .= " && " if $expr;
- $spotter =~ s|/|\\/|;
- $expr .= "\$f4 =~ /$spotter/o";
+ $spotter = shellregex($spotter);
+ $expr .= "\$f4 =~ m{$spotter}o";
}
#print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n";