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: V3.10.3, minor fixes in addLog function

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@16584 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2018-04-10 22:14:51 +00:00
parent 63429769c3
commit 286e523552
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 93_DbLog: V3.10.3, minor fixes in addLog function
- new: 00_Neuron.pm, 10_NeuronPin.pm: support for Neuron Devices - new: 00_Neuron.pm, 10_NeuronPin.pm: support for Neuron Devices
- feature: 59_WUup: add attribute round - feature: 59_WUup: add attribute round
- bugfix: 72_FB_CALLMONITOR: fix not working get command - bugfix: 72_FB_CALLMONITOR: fix not working get command

16
FHEM/93_DbLog.pm
View File

@ -16,6 +16,7 @@
############################################################################################################################################ ############################################################################################################################################
# Versions History done by DS_Starter & DeeSPe: # Versions History done by DS_Starter & DeeSPe:
# #
# 3.10.3 10.04.2018 minor fixes in addLog
# 3.10.2 09.04.2018 add qualifier CN=<caller name> to addlog # 3.10.2 09.04.2018 add qualifier CN=<caller name> to addlog
# 3.10.1 04.04.2018 changed event parsing of Weather # 3.10.1 04.04.2018 changed event parsing of Weather
# 3.10.0 02.04.2018 addLog consider DbLogExclude in Devices, keyword "!useExcludes" to switch off considering # 3.10.0 02.04.2018 addLog consider DbLogExclude in Devices, keyword "!useExcludes" to switch off considering
@ -198,7 +199,7 @@ use Time::HiRes qw(gettimeofday tv_interval);
use Encode qw(encode_utf8); use Encode qw(encode_utf8);
no if $] >= 5.017011, warnings => 'experimental::smartmatch'; no if $] >= 5.017011, warnings => 'experimental::smartmatch';
my $DbLogVersion = "3.10.2"; my $DbLogVersion = "3.10.3";
my %columns = ("DEVICE" => 64, my %columns = ("DEVICE" => 64,
"TYPE" => 64, "TYPE" => 64,
@ -3562,6 +3563,7 @@ sub DbLog_AddLog($$$$$) {
my $ce = AttrVal($name, "cacheEvents", 0); my $ce = AttrVal($name, "cacheEvents", 0);
my ($dev_type,$dev_name,$dev_reading,$read_val,$event,$ut); my ($dev_type,$dev_name,$dev_reading,$read_val,$event,$ut);
my @row_array; my @row_array;
my $ts;
return if(IsDisabled($name) || !$hash->{HELPER}{COLSET} || $init_done != 1); return if(IsDisabled($name) || !$hash->{HELPER}{COLSET} || $init_done != 1);
@ -3572,7 +3574,6 @@ sub DbLog_AddLog($$$$$) {
$value_fn = ''; $value_fn = '';
} }
my $ts = TimeNow();
my $now = gettimeofday(); my $now = gettimeofday();
my $rdspec = (split ":",$devrdspec)[-1]; my $rdspec = (split ":",$devrdspec)[-1];
@ -3601,7 +3602,7 @@ sub DbLog_AddLog($$$$$) {
my @v2 = split(/:/, $v1[$i]); # MinInterval wegschneiden, Bsp: "(temperature|humidity):600,battery:3600" my @v2 = split(/:/, $v1[$i]); # MinInterval wegschneiden, Bsp: "(temperature|humidity):600,battery:3600"
if($rd =~ m,^$v2[0]$,) { if($rd =~ m,^$v2[0]$,) {
# Reading matcht und soll vom addLog ausgeschlossen werden # Reading matcht und soll vom addLog ausgeschlossen werden
Log3 $name, 2, "DbLog $name -> Device: \"$dev_name\", reading: \"$v2[0]\" excluded by attribute DbLogExclude from addLog !"; Log3 $name, 2, "DbLog $name -> Device: \"$dev_name\", reading: \"$v2[0]\" excluded by attribute DbLogExclude from addLog !" if($rd =~ m/^$rdspec$/);
$do = 0; $do = 0;
} }
} }
@ -3618,7 +3619,7 @@ sub DbLog_AddLog($$$$$) {
foreach (@exrds) { foreach (@exrds) {
$dev_reading = $_; $dev_reading = $_;
$read_val = $value?$value:ReadingsVal($dev_name,$dev_reading,""); $read_val = defined($value)?$value:ReadingsVal($dev_name,$dev_reading,"");
$dev_type = uc($defs{$dev_name}{TYPE}); $dev_type = uc($defs{$dev_name}{TYPE});
# dummy-Event zusammenstellen # dummy-Event zusammenstellen
@ -3639,6 +3640,7 @@ sub DbLog_AddLog($$$$$) {
# Anwender spezifische Funktion anwenden # Anwender spezifische Funktion anwenden
if($value_fn ne '') { if($value_fn ne '') {
$ts = TimeNow();
my $TIMESTAMP = $ts; my $TIMESTAMP = $ts;
my $DEVICE = $dev_name; my $DEVICE = $dev_name;
my $DEVICETYPE = $dev_type; my $DEVICETYPE = $dev_type;
@ -3647,7 +3649,7 @@ sub DbLog_AddLog($$$$$) {
my $VALUE = $read_val; my $VALUE = $read_val;
my $UNIT = $ut; my $UNIT = $ut;
my $IGNORE = 0; my $IGNORE = 0;
my $CN = $cn if($cn); my $CN = $cn?$cn:"";
eval $value_fn; eval $value_fn;
Log3 $name, 2, "DbLog $name -> error valueFn: ".$@ if($@); Log3 $name, 2, "DbLog $name -> error valueFn: ".$@ if($@);
@ -5366,7 +5368,7 @@ sub dbReadings($@) {
set &lt;name&gt; addLog USV:state CN=di.cronjob <br> set &lt;name&gt; addLog USV:state CN=di.cronjob <br>
In the valueFn-function the caller "di.cronjob" is evaluated via the variable $CN and the timestamp is corrected: <br><br> In the valueFn-function the caller "di.cronjob" is evaluated via the variable $CN and the timestamp is corrected: <br><br>
valueFn = if($CN eq "di.cronjob" and $TIMESTAMP =~ m/\s00:00:[\d:]+/) { $TIMESTAMP =~ s/([^\s]+)\s/\1 00:00:00/ } valueFn = if($CN eq "di.cronjob" and $TIMESTAMP =~ m/\s00:00:[\d:]+/) { $TIMESTAMP =~ s/\s([^\s]+)/ 23:59:59/ }
</ul><br> </ul><br>
@ -6382,7 +6384,7 @@ sub dbReadings($@) {
set &lt;name&gt; addLog USV:state CN=di.cronjob <br> set &lt;name&gt; addLog USV:state CN=di.cronjob <br>
In der valueFn-Funktion wird der Aufrufer "di.cronjob" über die Variable $CN ausgewertet und davon abhängig der In der valueFn-Funktion wird der Aufrufer "di.cronjob" über die Variable $CN ausgewertet und davon abhängig der
Timestamp dieses addLog korrigiert: <br><br> Timestamp dieses addLog korrigiert: <br><br>
valueFn = if($CN eq "di.cronjob" and $TIMESTAMP =~ m/\s00:00:[\d:]+/) { $TIMESTAMP =~ s/([^\s]+)\s/\1 00:00:00/ } valueFn = if($CN eq "di.cronjob" and $TIMESTAMP =~ m/\s00:00:[\d:]+/) { $TIMESTAMP =~ s/\s([^\s]+)/ 23:59:59/ }
</ul><br> </ul><br>