From 155d6a32fd48c4912cc1f093d23b5ed0eb80ccad Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sun, 17 Dec 2017 12:01:30 +0000 Subject: [PATCH] 98_SVG.pm: correct last bugfix (Forum #80966 vs. #81131) git-svn-id: https://svn.fhem.de/fhem/trunk@15628 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/92_FileLog.pm | 1 - fhem/FHEM/98_SVG.pm | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/fhem/FHEM/92_FileLog.pm b/fhem/FHEM/92_FileLog.pm index f90237bf0..154e2a4a1 100644 --- a/fhem/FHEM/92_FileLog.pm +++ b/fhem/FHEM/92_FileLog.pm @@ -913,7 +913,6 @@ RESCAN: } my $j = $i+1; - $j += $data{svgOffset} if($data{svgOffset}); $data{"min$j"} = $min[$i]; $data{"max$j"} = $max[$i]; $data{"avg$j"} = $cnt[$i] ? sprintf("%0.1f", $sum[$i]/$cnt[$i]) : 0; diff --git a/fhem/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm index 39950748f..b9c73bfa0 100644 --- a/fhem/FHEM/98_SVG.pm +++ b/fhem/FHEM/98_SVG.pm @@ -1209,9 +1209,8 @@ SVG_getData($$$$$) my ($d, $f,$t,$srcDesc,$showData) = @_; my (@da, $ret, @vals); my @keys = ("min","mindate","max","maxdate","currval","currdate", - "firstval","firstdate","avg","cnt","lastraw"); + "firstval","firstdate","avg","cnt","lastraw","sum"); - $data{svgOffset} = 0; foreach my $src (@{$srcDesc->{order}}) { my $s = $srcDesc->{src}{$src}; my $fname = ($src eq $defs{$d}{LOGDEVICE} ? $defs{$d}{LOGFILE} : "CURRENT"); @@ -1230,10 +1229,8 @@ SVG_getData($$$$$) } push @vals, \%h; } - $data{svgOffset} += ($s->{idx}+1); } } - delete($data{svgOffset}); # Reorder the $data{maxX} stuff my ($min, $max) = (999999, -999999);