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

UConv: fix seasonPhenoChng

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19392 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2019-05-16 18:02:28 +00:00
parent 361287e4ee
commit 555d64d27b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/UConv.pm
View File

@ -14,7 +14,7 @@ use POSIX qw(strftime);
use Data::Dumper; use Data::Dumper;
sub GetSeason (;$$$); sub GetSeason (;$$$);
sub GetSeasonPheno ($$;$); sub _GetSeasonPheno ($$;$$);
sub _ReplaceStringByHashKey($$;$); sub _ReplaceStringByHashKey($$;$);
#################### ####################
@ -1470,7 +1470,7 @@ sub GetDaytime(;$$$$) {
# include season data # include season data
$ret = GetSeason( $ret, $lang ); $ret = GetSeason( $ret, $lang );
$ret = GetSeasonPheno( $ret, $lang ); $ret = _GetSeasonPheno( $ret, $lang );
#$ret = GetSeasonSocial( $ret, $lang ); #TODO https://de.wikipedia.org/wiki/F%C3%BCnfte_Jahreszeit #$ret = GetSeasonSocial( $ret, $lang ); #TODO https://de.wikipedia.org/wiki/F%C3%BCnfte_Jahreszeit
@ -1744,8 +1744,8 @@ sub GetSeason (;$$$) {
# Estimate phenologic season from astro and meteo season # Estimate phenologic season from astro and meteo season
# https://de.wikipedia.org/wiki/Ph%C3%A4nologie#Ph.C3.A4nologischer_Kalender # https://de.wikipedia.org/wiki/Ph%C3%A4nologie#Ph.C3.A4nologischer_Kalender
sub GetSeasonPheno ($$;$) { sub _GetSeasonPheno ($$;$$) {
my ( $time, $lang, $ret2 ) = @_; my ( $time, $lang, $seasonAstro, $seasonMeteo ) = @_;
$lang = ( $lang = (
$main::attr{global}{language} $main::attr{global}{language}
? $main::attr{global}{language} ? $main::attr{global}{language}
@ -1759,8 +1759,8 @@ sub GetSeasonPheno ($$;$) {
} }
else { else {
$ret = _time($time); $ret = _time($time);
$ret->{seasonAstro} = $ret2->{seasonAstro}; $ret->{seasonAstro} = $seasonAstro;
$ret->{seasonMeteo} = $ret2->{seasonMeteo}; $ret->{seasonMeteo} = $seasonMeteo;
} }
# stick to astro season first # stick to astro season first
@ -1870,9 +1870,9 @@ sub GetSeasonPheno ($$;$) {
return ( $ret->{seasonPheno} ) if (wantarray); return ( $ret->{seasonPheno} ) if (wantarray);
( $ret->{'-1'}{seasonPheno} ) = ( $ret->{'-1'}{seasonPheno} ) =
GetSeasonPheno( $ret->{'-1'}{time_t}, $lang, $ret ); _GetSeasonPheno( $ret->{'-1'}{time_t}, $lang, $ret->{'-1'}{seasonAstro}, $ret->{'-1'}{seasonMeteo} );
( $ret->{1}{seasonPheno} ) = ( $ret->{1}{seasonPheno} ) =
GetSeasonPheno( $ret->{1}{time_t}, $lang, $ret ); _GetSeasonPheno( $ret->{1}{time_t}, $lang, $ret->{1}{seasonAstro}, $ret->{1}{seasonMeteo} );
# text strings # text strings
my @langs = ('EN'); my @langs = ('EN');