93_DbLog: V3.8.5, Parse Event for Zwave changed

git-svn-id: https://svn.fhem.de/fhem/trunk@16224 2b470e98-0d58-463d-a4d8-8e2adae1ed80

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: V3.8.5, Parse Event for Zwave changed
   - feature: 00_MQTT: new attribute "client-id"
   - feature: 93_DbRep: V7.13.0, changeValue may use perlcode {} as "new string"
   - feature: 93_DbRep: V7.12.0, compression of dumpfile, restore of compressed

fhem/FHEM/93_DbLog.pm

@@ -16,6 +16,7 @@
 ############################################################################################################################################
 #  Versions History done by DS_Starter & DeeSPe:
 #
+# 3.8.5      16.02.2018       changed ParseEvent for Zwave
 # 3.8.4      07.02.2018       minor fixes of "$@", code review, eval for userCommand, DbLog_ExecSQL1 (forum:#83973)
 # 3.8.3      03.02.2018       call execmemcache only syncInterval/2 if cacheLimit reached and DB is not reachable, fix handling of
 #                             "$@" in DbLog_PushAsync 
@@ -186,7 +187,7 @@ use Blocking;
 use Time::HiRes qw(gettimeofday tv_interval);
 use Encode qw(encode_utf8);
 
-my $DbLogVersion = "3.8.4";
+my $DbLogVersion = "3.8.5";
 
 my %columns = ("DEVICE"  => 64,
                "TYPE"    => 64,
@@ -949,14 +950,22 @@ sub DbLog_ParseEvent($$$)
       }
   }
   
-  # FBDECT or ZWAVE
-  elsif (($type eq "FBDECT") || ($type eq "ZWAVE")) {
-    if ( $value=~/([\.\d]+)\s([a-z].*)/i ) {
+  # ZWAVE
+  elsif ($type eq "ZWAVE") {
+    if ( $value=~/([-\.\d]+)\s([a-z].*)/i ) {
      $value = $1;
      $unit  = $2;
     }
   }
 
+  # FBDECT
+  elsif ($type eq "FBDECT") {
+    if ( $value=~/([\.\d]+)\s([a-z].*)/i ) {
+     $value = $1;
+     $unit  = $2;
+    }
+  }
+  
   # MAX
   elsif(($type eq "MAX")) {
     $unit= "°C" if(lc($reading) =~ m/temp/);