Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

95_Astro: add missing wrapper function

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19797 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2019-07-08 15:54:03 +00:00
parent 4600380587
commit a966a056c4
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fhem/FHEM/95_Astro.pm
View File

@ -41,7 +41,7 @@ use FHEM::Meta;
use GPUtils qw(GP_Import GP_Export); use GPUtils qw(GP_Import GP_Export);
use Math::Trig; use Math::Trig;
use Time::HiRes qw(gettimeofday); use Time::HiRes qw(gettimeofday);
use Time::Local qw(timelocal_modern); use Time::Local;
use UConv; use UConv;
#use Data::Dumper; #use Data::Dumper;
@ -1071,6 +1071,31 @@ sub _LoadOptionalPackages {
$json->shrink; $json->shrink;
$json->utf8; $json->utf8;
} }
# only available for Perl versions after 2018-06-09
eval {
import Time::Local 'timelocal_modern';
1;
};
eval {
import Time::Local 'timegm_modern';
1;
};
}
########################################################################################################
#
# wrapper for Perl versions before 2018-06-09
#
########################################################################################################
sub _timelocal_modern {
return _timelocal_modern(@_)
if ( exists &{'timelocal_modern'} );
my @r = @_;
$r[5] -= 1900;
return timelocal(@r);
} }
######################################################################################################## ########################################################################################################
@ -2297,13 +2322,13 @@ sub Update($@) {
{ {
if ( $comp eq 'NewDay' ) { if ( $comp eq 'NewDay' ) {
push @next, push @next,
timelocal_modern( 0, 0, 0, (localtime($now + 86400.))[3,4], (localtime($now + 86400.))[5]+1900. ); _timelocal_modern( 0, 0, 0, (localtime($now + 86400.))[3,4], (localtime($now + 86400.))[5]+1900. );
next; next;
} }
my $k = ".$comp"; my $k = ".$comp";
next unless ( defined( $Astro{$k} ) && $Astro{$k} =~ /^\d+(?:\.\d+)?$/ ); next unless ( defined( $Astro{$k} ) && $Astro{$k} =~ /^\d+(?:\.\d+)?$/ );
my $t = my $t =
timelocal_modern( 0, 0, 0, (localtime($now))[3,4], (localtime($now))[5]+1900. ) + $Astro{$k} * 3600.; _timelocal_modern( 0, 0, 0, (localtime($now))[3,4], (localtime($now))[5]+1900. ) + $Astro{$k} * 3600.;
$t += 86400. if ( $t < $now ); # that is for tomorrow $t += 86400. if ( $t < $now ); # that is for tomorrow
push @next, $t; push @next, $t;
} }
@ -2637,7 +2662,7 @@ sub Get($@) {
return "[FHEM::Astro::Get] seconds can only be between 00 and 59" if (defined($9) && $9 > 59.); return "[FHEM::Astro::Get] seconds can only be between 00 and 59" if (defined($9) && $9 > 59.);
SetTime( SetTime(
timelocal_modern( _timelocal_modern(
defined($3) ? $3 : (defined($9) ? $9 : 0), defined($3) ? $3 : (defined($9) ? $9 : 0),
defined($2) ? $2 : (defined($8) ? $8 : 0), defined($2) ? $2 : (defined($8) ? $8 : 0),
defined($1) ? $1 : (defined($7) ? $7 : 12), defined($1) ? $1 : (defined($7) ? $7 : 12),