mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

93_DbLog: Forum #42727 - Evaluate RegExp and reduce other output for delta-calculation

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@9686 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rapster
2015-10-26 10:48:20 +00:00
parent a6819ab987
commit b09aa28a3c
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/93_DbLog.pm
View File

@@ -1016,6 +1016,16 @@ DbLog_Get($@)
while($sth->fetch()) {
if($readings[$i]->[4]) {
#evaluate
my $val = $sql_value;
my $ts = $sql_timestamp;
eval("$readings[$i]->[4]");
$sql_value = $val;
$sql_timestamp = $ts;
if($@) {Log3 $hash->{NAME}, 3, "DbLog: Error in inline function: <".$readings[$i]->[4].">, Error: $@";}
}
if($sql_timestamp lt $from && $deltacalc) {
if(Scalar::Util::looks_like_number($sql_value)){
#nur setzen wenn nummerisch
@@ -1034,16 +1044,9 @@ DbLog_Get($@)
# die Regexep wird vor der Function ausgewertet und der Wert im Feld
# Value angepasst.
####################################################################
if($readings[$i]->[4] && $readings[$i]->[4]) {
#evaluate
my $val = $sql_value;
my $ts = $sql_timestamp;
eval("$readings[$i]->[4]");
$sql_value = $val;
$sql_timestamp = $ts;
if($@) {Log3 $hash->{NAME}, 3, "DbLog: Error in inline function: <".$readings[$i]->[4].">, Error: $@";}
if($readings[$i]->[4]) {
$out_tstamp = $sql_timestamp;
$writeout=1;
$writeout=1 if(!$deltacalc);
}
############ Auswerten des 4. Parameters: function ###################