From c0a73de6e6e1bac2fc03f49232121ff885dce291 Mon Sep 17 00:00:00 2001
From: nasseeder1 <nasseeder1@users.noreply.github.com>
Date: Thu, 3 Aug 2017 21:45:51 +0000
Subject: [PATCH] 93_DbLog, back to V2.22.0, Forum:#75039

git-svn-id: https://svn.fhem.de/fhem/trunk@14842 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED          | 1 +
 fhem/FHEM/93_DbLog.pm | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 3e9303b42..b8d0140d7 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.
+  - bugfix:  93_DbLog, back to V2.22.0, Forum:#75039
   - bugfix:  93_DbLog, V2.22.1, Forum:#74690, warning unitialized value
   - feature: 70_WINCONNECT: [WinWebGUI] - Fenster verstecken
   - feature: 57_Calendar: added attribute cutoffOlderThan (forum #74481)
diff --git a/fhem/FHEM/93_DbLog.pm b/fhem/FHEM/93_DbLog.pm
index 9f64d841d..af394f9ad 100644
--- a/fhem/FHEM/93_DbLog.pm
+++ b/fhem/FHEM/93_DbLog.pm
@@ -16,7 +16,6 @@
 ############################################################################################################################################
 #  Versions History done by DS_Starter & DeeSPe:
 #
-# 2.22.1     25.07.2017       Forum:#74690, bug unitialized in row 734,4318 -> "if($fld[0] && $fld[1])" 
 # 2.22.0     25.07.2017       attribute "addStateEvent" added
 # 2.21.3     24.07.2017       commandref revised
 # 2.21.2     19.07.2017       changed readCfg to report more error-messages
@@ -144,7 +143,7 @@ use Blocking;
 use Time::HiRes qw(gettimeofday tv_interval);
 use Encode qw(encode_utf8);
 
-my $DbLogVersion = "2.22.1";
+my $DbLogVersion = "2.22.0";
 
 my %columns = ("DEVICE"  => 64,
                "TYPE"    => 64,
@@ -732,10 +731,10 @@ sub DbLog_regexpFn($$) {
     my @fld = split(":", $a[$i]);
 
     $ret .= '|' if( $ret );
-    $ret .=  $fld[0] .'.'. $fld[1] if($fld[0] && $fld[1]);
+    $ret .=  $fld[0] .'.'. $fld[1];
   }                  
 
-return $ret;
+  return $ret;
 }
 
 ################################################################
@@ -4315,7 +4314,7 @@ DbLog_sampleDataFn($$$$$)
     for(my $r=0; $r < $max; $r++) {
       my @f = split(":", ($dlog->[$r] ? $dlog->[$r] : ":::"), 4);
       my $ret = "";
-      $ret .= SVG_txt("par_${r}_0", "", "$f[0]:$f[1]:$f[2]:$f[3]", 20) if($f[0]&&$f[1]&&$f[2]&&$f[3]);
+      $ret .= SVG_txt("par_${r}_0", "", "$f[0]:$f[1]:$f[2]:$f[3]", 20);
 #      $ret .= SVG_txt("par_${r}_2", "", $f[2], 1); # Default not yet implemented
 #      $ret .= SVG_txt("par_${r}_3", "", $f[3], 3); # Function
 #      $ret .= SVG_txt("par_${r}_4", "", $f[4], 3); # RegExp