93_DbRep: daylight saving time check improved
git-svn-id: https://svn.fhem.de/fhem/trunk@12489 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
@@ -3388,10 +3388,10 @@ sub collaggstr($$$$) {
|
|||||||
|
|
||||||
# Tagesaggregation
|
# Tagesaggregation
|
||||||
if ($aggregation eq "day") {
|
if ($aggregation eq "day") {
|
||||||
$runtime = $runtime+3600 if((dsttest($hash,$runtime,$aggsec))); # Korrektur Winterzeitumstellung (Uhr wurde 1 Stunde zurück gestellt)
|
|
||||||
$runtime_string = strftime "%Y-%m-%d", localtime($runtime); # für Readingname
|
$runtime_string = strftime "%Y-%m-%d", localtime($runtime); # für Readingname
|
||||||
$runtime_string_first = strftime "%Y-%m-%d %H:%M:%S", localtime($runtime) if($i==1);
|
$runtime_string_first = strftime "%Y-%m-%d %H:%M:%S", localtime($runtime) if($i==1);
|
||||||
$runtime_string_first = strftime "%Y-%m-%d", localtime($runtime) if($i>1);
|
$runtime_string_first = strftime "%Y-%m-%d", localtime($runtime) if($i>1);
|
||||||
|
$runtime = $runtime+3600 if(dsttest($hash,$runtime,$aggsec)); # Korrektur Winterzeitumstellung (Uhr wurde 1 Stunde zurück gestellt)
|
||||||
|
|
||||||
if((($tsstr gt $testr) ? $runtime : ($runtime+$aggsec)) > $epoch_seconds_end) {
|
if((($tsstr gt $testr) ? $runtime : ($runtime+$aggsec)) > $epoch_seconds_end) {
|
||||||
$runtime_string_first = strftime "%Y-%m-%d", localtime($runtime);
|
$runtime_string_first = strftime "%Y-%m-%d", localtime($runtime);
|
||||||
|
|||||||
Reference in New Issue
Block a user