FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

93_DbLog: default Event parsing changed again, Forum: #106769

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21051 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-01-25 20:53:06 +00:00
parent 1fc9bacbab
commit 45bb5e1674
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/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.
- change: 93_DbLog: default Event parsing changed again, Forum: #106769
- change: 93_DbRep: adjust behavior of writeToDB - write value at every begin - change: 93_DbRep: adjust behavior of writeToDB - write value at every begin
and also at every end of period, fix Warning when Agent and also at every end of period, fix Warning when Agent
has detected a renamed device, remove adminCredentials has detected a renamed device, remove adminCredentials

7
fhem/FHEM/93_DbLog.pm
View File

@ -30,6 +30,7 @@ no if $] >= 5.017011, warnings => 'experimental::smartmatch';
# Version History intern by DS_Starter: # Version History intern by DS_Starter:
our %DbLog_vNotesIntern = ( our %DbLog_vNotesIntern = (
"4.9.9" => "21.01.2020 default ParseEvent changed again, Forum: #106769 ",
"4.9.8" => "17.01.2020 adjust configCheck with plotEmbed check. Forum: #107383 ", "4.9.8" => "17.01.2020 adjust configCheck with plotEmbed check. Forum: #107383 ",
"4.9.7" => "13.01.2020 change datetime pattern in valueFn of DbLog_addCacheLine. Forum: #107285 ", "4.9.7" => "13.01.2020 change datetime pattern in valueFn of DbLog_addCacheLine. Forum: #107285 ",
"4.9.6" => "04.01.2020 fix change off 4.9.4 in default splitting. Forum: #106992 ", "4.9.6" => "04.01.2020 fix change off 4.9.4 in default splitting. Forum: #106992 ",
@ -994,13 +995,15 @@ sub DbLog_ParseEvent($$$$) {
$value = join(": ", @parts); $value = join(": ", @parts);
$unit = ""; $unit = "";
} }
# Log3 $name, 2, "DbLog $name -> ParseEvent - Event: $event, Reading: $reading, Value: $value, Unit: $unit";
#default #default
if(!defined($reading)) { $reading = ""; } if(!defined($reading)) { $reading = ""; }
if(!defined($value)) { $value = ""; } if(!defined($value)) { $value = ""; }
if($value eq "") { # Default Splitting geändert 04.01.20 Forum: #106992 if($value eq "") { # Default Splitting geändert 04.01.20 Forum: #106992
if($reading =~ /:$/) { if($event =~ /^.*:\s$/) { # und 21.01.20 Forum: #106769
$reading = (split(":", $reading))[0]; $reading = (split(":", $event))[0];
} else { } else {
$reading = "state"; $reading = "state";
$value = $event; $value = $event;