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

93_DBLog.pm: added feature to using logproxy

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6573 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tobiasfaust 2014-09-19 17:08:11 +00:00
parent 0edc52b492
commit e5a43457f9
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/93_DbLog.pm
View File

@ -796,7 +796,7 @@ DbLog_Get($@)
my ($retval,$sql_timestamp, $sql_device, $sql_reading, $sql_value, $type, $event, $unit) = ""; my ($retval,$sql_timestamp, $sql_device, $sql_reading, $sql_value, $type, $event, $unit) = "";
my @ReturnArray; my @ReturnArray;
my $writeout = 0; my $writeout = 0;
my (@min, @max, @sum, @cnt, @lastv, @lastd); my (@min, @max, @sum, @cnt, @lastv, @lastd, @mind, @maxd);
my (%tstamp, %lasttstamp, $out_tstamp, $out_value, $minval, $maxval); #fuer delta-h/d Berechnung my (%tstamp, %lasttstamp, $out_tstamp, $out_value, $minval, $maxval); #fuer delta-h/d Berechnung
#extract the Device:Reading arguments into @readings array #extract the Device:Reading arguments into @readings array
@ -858,6 +858,8 @@ DbLog_Get($@)
$cnt[$i] = 0; $cnt[$i] = 0;
$lastv[$i] = 0; $lastv[$i] = 0;
$lastd[$i] = "undef"; $lastd[$i] = "undef";
$mind[$i] = "undef";
$maxd[$i] = "undef";
$minval = 999999; $minval = 999999;
$maxval = -999999; $maxval = -999999;
@ -1005,8 +1007,14 @@ DbLog_Get($@)
if(Scalar::Util::looks_like_number($sql_value)){ if(Scalar::Util::looks_like_number($sql_value)){
#nur setzen wenn nummerisch #nur setzen wenn nummerisch
$min[$i] = $sql_value if($sql_value < $min[$i]); if($sql_value < $min[$i]) {
$max[$i] = $sql_value if($sql_value > $max[$i]);; $min[$i] = $sql_value;
$mind[$i] = $sql_timestamp;
}
if($sql_value > $max[$i]) {
$max[$i] = $sql_value;
$maxd[$i] = $sql_timestamp;
}
$sum[$i] += $sql_value; $sum[$i] += $sql_value;
$minval = $sql_value if($sql_value < $minval); $minval = $sql_value if($sql_value < $minval);
$maxval = $sql_value if($sql_value > $maxval); $maxval = $sql_value if($sql_value > $maxval);
@ -1063,6 +1071,8 @@ DbLog_Get($@)
$data{"cnt$k"} = $cnt[$j] ? $cnt[$j] : "undef"; $data{"cnt$k"} = $cnt[$j] ? $cnt[$j] : "undef";
$data{"currval$k"} = $lastv[$j]; $data{"currval$k"} = $lastv[$j];
$data{"currdate$k"} = $lastd[$j]; $data{"currdate$k"} = $lastd[$j];
$data{"mindate$k"} = $mind[$j];
$data{"maxdate$k"} = $maxd[$j];
} }
#cleanup plotfork connection #cleanup plotfork connection