From 45bb5e16740263627e7efc2f5e622a068a75feae Mon Sep 17 00:00:00 2001 From: nasseeder1 <nasseeder1@users.noreply.github.com> Date: Sat, 25 Jan 2020 20:53:06 +0000 Subject: [PATCH] 93_DbLog: default Event parsing changed again, Forum: #106769 git-svn-id: https://svn.fhem.de/fhem/trunk@21051 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/93_DbLog.pm | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 736036d87..a43f72935 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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. + - change: 93_DbLog: default Event parsing changed again, Forum: #106769 - change: 93_DbRep: adjust behavior of writeToDB - write value at every begin and also at every end of period, fix Warning when Agent has detected a renamed device, remove adminCredentials diff --git a/fhem/FHEM/93_DbLog.pm b/fhem/FHEM/93_DbLog.pm index 3dfa83ca4..f0abff1b7 100644 --- a/fhem/FHEM/93_DbLog.pm +++ b/fhem/FHEM/93_DbLog.pm @@ -30,6 +30,7 @@ no if $] >= 5.017011, warnings => 'experimental::smartmatch'; # Version History intern by DS_Starter: 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.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 ", @@ -994,13 +995,15 @@ sub DbLog_ParseEvent($$$$) { $value = join(": ", @parts); $unit = ""; } + + # Log3 $name, 2, "DbLog $name -> ParseEvent - Event: $event, Reading: $reading, Value: $value, Unit: $unit"; #default if(!defined($reading)) { $reading = ""; } if(!defined($value)) { $value = ""; } if($value eq "") { # Default Splitting geƤndert 04.01.20 Forum: #106992 - if($reading =~ /:$/) { - $reading = (split(":", $reading))[0]; + if($event =~ /^.*:\s$/) { # und 21.01.20 Forum: #106769 + $reading = (split(":", $event))[0]; } else { $reading = "state"; $value = $event;