From 6993b3b241d13bb233d95395cc6a5a7b0b42b06d Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Fri, 12 Oct 2018 19:42:32 +0000 Subject: [PATCH] 93_DbLog: contrib 3.12.5 git-svn-id: https://svn.fhem.de/fhem/trunk@17521 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/93_DbLog.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fhem/contrib/DS_Starter/93_DbLog.pm b/fhem/contrib/DS_Starter/93_DbLog.pm index 4504155f3..2ad17f3f5 100644 --- a/fhem/contrib/DS_Starter/93_DbLog.pm +++ b/fhem/contrib/DS_Starter/93_DbLog.pm @@ -955,7 +955,6 @@ sub DbLog_ParseEvent($$$) if ($reading =~ m(^temperature)) { $unit= "°C"; } # wenn reading mit temperature beginnt elsif($reading =~ m(^humidity)) { $unit= "%"; } - # the interpretation of the argument depends on the device type # EMEM, M232Counter, M232Voltage return plain numbers if(($type eq "M232Voltage") || @@ -3880,7 +3879,8 @@ return($useac,$useta); ############################################################################### sub DbLog_charfilter ($) { my ($txt) = @_; - + my ($p,$a); + # nur erwünschte Zeichen ASCII %d32-126 und Sonderzeichen $txt =~ s/ß/ss/g; $txt =~ s/ä/ae/g; @@ -3890,8 +3890,9 @@ sub DbLog_charfilter ($) { $txt =~ s/Ö/Oe/g; $txt =~ s/Ü/Ue/g; $txt =~ s/€/EUR/g; + $txt =~ s/^\xb0/°/g; + $txt =~ tr/ A-Za-z0-9!"#$%&'()*+,-.\/:;<=>?@[\\]^_`{|}~°//cd; - $txt =~ s/\xB0C/°C/g; return($txt); }