FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 10:46:53 +00:00
Code Issues Releases Wiki Activity

92_FileLog.pm: fix multiple delta-d from one source (Forum #131344)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26959 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2023-01-04 12:56:01 +00:00
parent ad9cc9ff22
commit 3d5842d99f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/92_FileLog.pm
View File

@ -1000,7 +1000,7 @@ RESCAN:
my $ld = substr($fld[0],0,$hd); # TimeStamp-Part (hour or date) my $ld = substr($fld[0],0,$hd); # TimeStamp-Part (hour or date)
if(!defined($h->{last1}) || $h->{last3} ne $ld) { if(!defined($h->{last1}) || $h->{last3} ne $ld) {
if(defined($h->{last1})) { if(defined($h->{last1})) {
my @lda = split("[_:]", $lastdate{$hd}); my @lda = split("[_:]", $lastdate{$i});
my $ts = "12:00:00"; # middle timestamp my $ts = "12:00:00"; # middle timestamp
$ts = "$lda[1]:30:00" if($hd == 13); $ts = "$lda[1]:30:00" if($hd == 13);
my $v = $fld[$col]-$h->{last1}; my $v = $fld[$col]-$h->{last1};
@ -1018,7 +1018,7 @@ RESCAN:
$h->{last3} = $ld; $h->{last3} = $ld;
} }
$h->{last2} = $fld[$col]; $h->{last2} = $fld[$col];
$lastdate{$hd} = $fld[0]; $lastdate{$i} = $fld[0];
} elsif($t == 3) { # int function } elsif($t == 3) { # int function
$val = $1 if($fld[$col] =~ m/^(\d+).*/o); $val = $1 if($fld[$col] =~ m/^(\d+).*/o);
@ -1100,7 +1100,7 @@ RESCAN:
for(my $i = 0; $i < int(@a); $i++) { for(my $i = 0; $i < int(@a); $i++) {
my $h = $d[$i]; my $h = $d[$i];
my $hd = $h->{didx}; my $hd = $h->{didx};
if($hd && $lastdate{$hd}) { if($hd && $lastdate{$i}) {
my $val = defined($h->{last1}) ? $h->{last2}-$h->{last1} : 0; my $val = defined($h->{last1}) ? $h->{last2}-$h->{last1} : 0;
$min[$i] = $val if($min[$i] == 999999); $min[$i] = $val if($min[$i] == 999999);
$max[$i] = $val if($max[$i] == -999999); $max[$i] = $val if($max[$i] == -999999);
@ -1108,7 +1108,7 @@ RESCAN:
$sum[$i] = ($sum[$i] ? $sum[$i] + $val : $val); $sum[$i] = ($sum[$i] ? $sum[$i] + $val : $val);
$cnt[$i]++; $cnt[$i]++;
my @lda = split("[_:]", $lastdate{$hd}); my @lda = split("[_:]", $lastdate{$i});
my $ts = "12:00:00"; # middle timestamp my $ts = "12:00:00"; # middle timestamp
$ts = "$lda[1]:30:00" if($hd == 13); $ts = "$lda[1]:30:00" if($hd == 13);
my $line = sprintf("%s_%s %0.1f\n", $lda[0],$ts, my $line = sprintf("%s_%s %0.1f\n", $lda[0],$ts,