From 1c0d5191a36f6b820c0c460b46cd5f90ce8071a9 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Thu, 10 Oct 2019 20:08:06 +0000 Subject: [PATCH] 93_DbLog: contrib 4.8.0 git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@20343 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- contrib/DS_Starter/93_DbLog.pm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/contrib/DS_Starter/93_DbLog.pm b/contrib/DS_Starter/93_DbLog.pm index 8d8b0c88b..10102ea1d 100644 --- a/contrib/DS_Starter/93_DbLog.pm +++ b/contrib/DS_Starter/93_DbLog.pm @@ -2147,7 +2147,7 @@ sub DbLog_execmemcache ($) { Log3 $hash->{NAME}, 5, "DbLog $name -> MemCache contains: ".$data{DbLog}{$name}{cache}{memcache}{$key}; push(@row_array, delete($data{DbLog}{$name}{cache}{memcache}{$key})); } - delete $data{DbLog}{$name}{cache}{memcache}; # sicherheitshalber Memory freigeben: https://perlmaven.com/undef-on-perl-arrays-and-hashes, bzw. https://www.effectiveperlprogramming.com/2018/09/undef-a-scalar-to-release-its-memory/ + delete $data{DbLog}{$name}{cache}{memcache}; # sicherheitshalber Memory freigeben: https://perlmaven.com/undef-on-perl-arrays-and-hashes , bzw. https://www.effectiveperlprogramming.com/2018/09/undef-a-scalar-to-release-its-memory/ my $rowlist = join('ยง', @row_array); $rowlist = encode_base64($rowlist,""); @@ -3209,8 +3209,9 @@ sub DbLog_Get($@) { $lastd[$i] = "undef"; $mind[$i] = "undef"; $maxd[$i] = "undef"; - $minval = (~0 >> 1); - $maxval = -(~0 >> 1); + $minval = (~0 >> 1); # ist "9223372036854775807" + $maxval = -(~0 >> 1); # ist "-9223372036854775807" +Log3 ($name, 1, "$name - Init Maxval: $maxval , Init Minval: $minval "); $deltacalc = 0; if($readings[$i]->[3] && ($readings[$i]->[3] eq "delta-h" || $readings[$i]->[3] eq "delta-d")) { @@ -3403,7 +3404,7 @@ sub DbLog_Get($@) { $retvaldummy = ""; if(($tstamp{hour}-$lasttstamp{hour}) > 1) { - for (my $j=$lasttstamp{hour}+1; $j < $tstamp{hour}; $j++) { + for (my $j = $lasttstamp{hour}+1; $j < $tstamp{hour}; $j++) { $out_value = "0"; $hour = $j; $hour = '0'.$j if $j<10; @@ -3442,7 +3443,8 @@ sub DbLog_Get($@) { } } - $out_value = sprintf("%g", $maxval - $minval); + $out_value = sprintf("%g", $maxval - $minval) if($minval != (~0 >> 1) && $maxval != -(~0 >> 1)); + Log3 ($name, 1, "$name - Maxval result: $maxval , Minval result: $minval "); $sum[$i] += $out_value; $cnt[$i]++; $out_tstamp = DbLog_implode_datetime($lasttstamp{year}, $lasttstamp{month}, $lasttstamp{day}, $lasttstamp{hour}, "30", "00");