projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed extraneous help files from load
[spider.git]
/
cmd
/
show
/
dx.pl
diff --git
a/cmd/show/dx.pl
b/cmd/show/dx.pl
index 74b4c0a9f2333e984bba8791866cdd063ca74a90..42fb646c8c8748d0eaf07b2f422928c12e77d942 100644
(file)
--- a/
cmd/show/dx.pl
+++ b/
cmd/show/dx.pl
@@
-20,7
+20,7
@@
my $info;
my $expr;
while ($f = shift @list) { # next field
my $expr;
while ($f = shift @list) { # next field
- print "f: $f list: ", join(',', @list), "\n";
+
#
print "f: $f list: ", join(',', @list), "\n";
if (!$from && !$to) {
($from, $to) = $f =~ /^(\d+)-(\d+)$/o; # is it a from -> to count?
next if $from && $to > $from;
if (!$from && !$to) {
($from, $to) = $f =~ /^(\d+)-(\d+)$/o; # is it a from -> to count?
next if $from && $to > $from;
@@
-30,28
+30,28
@@
while ($f = shift @list) { # next field
next if $to;
}
if (lc $f eq 'on' && $list[0]) { # is it freq range?
next if $to;
}
if (lc $f eq 'on' && $list[0]) { # is it freq range?
- print "yup freq\n";
+
#
print "yup freq\n";
my @r = split '/', $list[0];
my @r = split '/', $list[0];
-
print "r0: $r[0] r1: $r[1]\n";
+
#
print "r0: $r[0] r1: $r[1]\n";
@freq = Bands::get_freq($r[0], $r[1]);
if (@freq) { # yup, get rid of extranous param
@freq = Bands::get_freq($r[0], $r[1]);
if (@freq) { # yup, get rid of extranous param
-
print "freq: ", join(',', @freq), "\n";
+
#
print "freq: ", join(',', @freq), "\n";
shift @list;
next;
}
}
if (lc $f eq 'day' && $list[0]) {
shift @list;
next;
}
}
if (lc $f eq 'day' && $list[0]) {
-
print "got day\n";
+
#
print "got day\n";
($fromday, $today) = split '-', shift(@list);
next;
}
if (lc $f eq 'info' && $list[0]) {
($fromday, $today) = split '-', shift(@list);
next;
}
if (lc $f eq 'info' && $list[0]) {
-
print "got info\n";
+
#
print "got info\n";
$info = shift @list;
next;
}
if (lc $f eq 'spotter' && $list[0]) {
$info = shift @list;
next;
}
if (lc $f eq 'spotter' && $list[0]) {
- print "got spotter\n";
+
#
print "got spotter\n";
$spotter = uc shift @list;
next;
}
$spotter = uc shift @list;
next;
}
@@
-100,7
+100,7
@@
if ($spotter) {
$expr .= "\$f4 =~ /$spotter/o";
}
$expr .= "\$f4 =~ /$spotter/o";
}
-print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n";
+
#
print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n";
# now do the search
my @res = Spot::search($expr, $fromday, $today, $from, $to);
# now do the search
my @res = Spot::search($expr, $fromday, $today, $from, $to);
@@
-108,9
+108,7
@@
my $ref;
my @dx;
foreach $ref (@res) {
@dx = @$ref;
my @dx;
foreach $ref (@res) {
@dx = @$ref;
- my $t = ztime($dx[2]);
- my $d = cldate($dx[2]);
- push @out, sprintf "%9s %-12s %s %s %-28s <%s>", $dx[0], $dx[1], $d, $t, $dx[3], $dx[4];
+ push @out, Spot::formatl(@dx);
}
return (1, @out);
}
return (1, @out);