X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fsun.pl;h=cf27423e48e1b5739689829728fdb7403808f2c1;hb=ab811a0c902225075a9bd69749f65594079433a9;hp=d7c9766ccdcfea78a475007dbecc39b225c3bf6f;hpb=d0adf21cbcea77d72ffc021441961039c41852bf;p=spider.git diff --git a/cmd/show/sun.pl b/cmd/show/sun.pl index d7c9766c..cf27423e 100644 --- a/cmd/show/sun.pl +++ b/cmd/show/sun.pl @@ -39,7 +39,7 @@ my @in; if (@list) { foreach $l (@list) { - my $user = DXUser->get_current(uc $l); + my $user = DXUser::get_current(uc $l); if ($user && $user->lat && $user->long) { push @in, [$user->qth, $user->lat, -$user->long, uc $l ]; } else { @@ -70,7 +70,8 @@ if( !$n_offset ) { } foreach $l (@in) { - my ($rise, $set, $az, $dec, $loss )=Sun::rise_set($yr,$month,$day,$hr,$min,$l->[1],$l->[2],0); + my ($dawn, $rise, $set, $dusk, $az, $dec )=Sun::rise_set($yr,$month,$day,$hr,$min,$l->[1],$l->[2],0); + $l->[3] =~ s{(-\d+|/\w+)$}{}; if( !$n_offset ) { push @out,sprintf("%-6.6s %-30.30s %02d/%02d/%4d %s %s %6.1f %6.1f", $l->[3], $l->[0], $day, $month, $yr, $rise, $set, $az, $dec);