FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 17:36:39 +00:00
Code Issues Releases Wiki Activity

93_DbLog: contrib 5.8.8

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@27556 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2023-05-12 12:39:05 +00:00
parent d5a9690d59
commit dae842d64b
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fhem/contrib/DS_Starter/93_DbLog.pm
View File

@ -1,5 +1,5 @@
############################################################################################################################################ ############################################################################################################################################
# $Id: 93_DbLog.pm 27504 2023-05-11 19:36:29Z DS_Starter $ # $Id: 93_DbLog.pm 27504 2023-05-12 19:36:29Z DS_Starter $
# #
# 93_DbLog.pm # 93_DbLog.pm
# written by Dr. Boris Neubert 2007-12-30 # written by Dr. Boris Neubert 2007-12-30
@ -28,6 +28,7 @@ eval "use FHEM::Utility::CTZ qw(:all);1;" or my $ctzAbsent = 1;
eval "use Storable qw(freeze thaw);1;" or my $storabs = "Storable"; ## no critic 'eval' eval "use Storable qw(freeze thaw);1;" or my $storabs = "Storable"; ## no critic 'eval'
#use Data::Dumper; #use Data::Dumper;
use Scalar::Util qw(looks_like_number);
use Time::HiRes qw(gettimeofday tv_interval usleep); use Time::HiRes qw(gettimeofday tv_interval usleep);
use Time::Local; use Time::Local;
use Encode qw(encode_utf8); use Encode qw(encode_utf8);
@ -38,7 +39,7 @@ no if $] >= 5.017011, warnings => 'experimental::smartmatch';
# Version History intern by DS_Starter: # Version History intern by DS_Starter:
my %DbLog_vNotesIntern = ( my %DbLog_vNotesIntern = (
"5.8.8" => "11.05.2023 ", "5.8.8" => "11.05.2023 _DbLog_ParseEvent changed default splitting, Forum: https://forum.fhem.de/index.php?topic=133537.0 ",
"5.8.7" => "01.05.2023 new Events FRAME_INITIALIZED, SUBPROC_INITIALIZED, SUBPROC_DISCONNECTED, SUBPROC_STOPPED ". "5.8.7" => "01.05.2023 new Events FRAME_INITIALIZED, SUBPROC_INITIALIZED, SUBPROC_DISCONNECTED, SUBPROC_STOPPED ".
"Forum: https://forum.fhem.de/index.php?topic=133403.0, minor fixes ", "Forum: https://forum.fhem.de/index.php?topic=133403.0, minor fixes ",
"5.8.6" => "25.03.2023 change _DbLog_plotData (intx), Plot Editor: include functions delta-h, delta-h, ...". "5.8.6" => "25.03.2023 change _DbLog_plotData (intx), Plot Editor: include functions delta-h, delta-h, ...".
@ -1564,26 +1565,20 @@ sub _DbLog_ParseEvent {
# "day-temp: 22.0 (Celsius)" -> "day-temp", "22.0 (Celsius)" # "day-temp: 22.0 (Celsius)" -> "day-temp", "22.0 (Celsius)"
my @parts = split /: /, $event, 2; my @parts = split /: /, $event, 2;
if(scalar @parts == 2) { if(scalar @parts == 2) { # V 5.8.8 default Splitting komplett umgebaut
$reading = shift @parts; $reading = shift @parts;
my $tail = shift @parts; my $tail = shift @parts;
@parts = split " ", $tail; @parts = split " ", $tail;
if (scalar @parts <= 2) { $value = $tail;
$unit = q{};
if (scalar @parts <= 2 && looks_like_number($parts[0])) {
$value = $parts[0]; $value = $parts[0];
$unit = $parts[1] // q{}; $unit = $parts[1] // q{};
} }
else {
$value = $tail;
$unit = q{};
}
}
else {
$value = join ": ", @parts;
$unit = "";
} }
#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
@ -1598,7 +1593,7 @@ sub _DbLog_ParseEvent {
# globales Abfangen von # changed in Version 4.12.5 # globales Abfangen von # changed in Version 4.12.5
# - humidity # - humidity
if($reading =~ m(^humidity)) { $unit = "%"; } # wenn reading mit humidity beginnt #if($reading =~ m(^humidity)) { $unit = "%"; } # wenn reading mit humidity beginnt
# the interpretation of the argument depends on the device type # the interpretation of the argument depends on the device type