From 06a5a6cd8ceabfad5b6ca96c9684d124acc548c5 Mon Sep 17 00:00:00 2001
From: nasseeder1 <nasseeder1@users.noreply.github.com>
Date: Sat, 25 May 2024 13:29:41 +0000
Subject: [PATCH] 93_DbRep/93_DbLog: replace Smartmatch Forum:#137776

git-svn-id: https://svn.fhem.de/fhem/trunk@28904 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/93_DbLog.pm | 21 ++++++++++-----------
 fhem/FHEM/93_DbRep.pm |  4 ++--
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/fhem/FHEM/93_DbLog.pm b/fhem/FHEM/93_DbLog.pm
index a5e8d68e0..307332b27 100644
--- a/fhem/FHEM/93_DbLog.pm
+++ b/fhem/FHEM/93_DbLog.pm
@@ -54,12 +54,12 @@ use Encode qw(encode_utf8);
 use HttpUtils;
 use SubProcess;
 
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
-
 use vars qw($FW_ME $FW_subdir);                                      # predeclare global variable names
 
 # Version History intern by DS_Starter:
 my %DbLog_vNotesIntern = (
+  "5.10.1"  => "01.04.2024 _DbLog_plotData: avoid possible uninitialized value \$out_value (SVG: Argument '' isn't numeric) ".
+                           "replace Smartmatch Forum:#137776 ",
   "5.10.0"  => "17.03.2024 support of MariaDB driver, optimize Timer execMemCacheAsync, optimize DbLog_configcheck,_DbLog_SBP_connectDB ".
                            "remove countNbl, support compression between client and server, improved performance if attr excludeDevs is set ".
                            "Fix _DbLog_plotData Forum: https://forum.fhem.de/index.php?topic=136930.0 ",
@@ -821,14 +821,13 @@ sub _DbLog_setaddLog {                   ## no critic "not used"
   }
 
   my @args = @{$argsref};
-
-  my $nce = ("\!useExcludes" ~~ @args) ? 1 : 0;
+  my $nce  = grep (/\!useExcludes/, @args) ? 1 : 0;    
 
   map (s/\!useExcludes//g, @args);
 
   my $cn;
 
-  if(/CN=/ ~~ @args) {
+  if (grep (/CN=/, @args)) {                        
       my $t = join " ", @args;
       ($cn) = ($t =~ /^.*CN=(\w+).*$/);
       map(s/CN=$cn//g, @args);
@@ -6876,23 +6875,23 @@ sub _DbLog_plotData {
               $writeout = 0 if (!defined($sql_value) && AttrVal($name, 'suppressUndef', 0));
 
               ###################### Ausgabe ###########################
-              if($writeout) {
+              if ($writeout) {
                   if ($outf =~ m/(all)/) {
                       # Timestamp: Device, Type, Event, Reading, Value, Unit
                       $retval .= sprintf("%s: %s, %s, %s, %s, %s, %s\n", $out_tstamp, $sql_device, $type, $event, $sql_reading, $out_value, $unit);
                       $retval .= $retvaldummy;
                   }
                   elsif ($outf =~ m/(array)/) {
-                      push(@ReturnArray, {"tstamp" => $out_tstamp, "device" => $sql_device, "type" => $type, "event" => $event, "reading" => $sql_reading, "value" => $out_value, "unit" => $unit});
+                      push (@ReturnArray, {"tstamp" => $out_tstamp, "device" => $sql_device, "type" => $type, "event" => $event, "reading" => $sql_reading, "value" => $out_value, "unit" => $unit});
                   }
-                  else {                                                         # generating plots
-                      $out_tstamp =~ s/\ /_/g;                                   # needed by generating plots
-                      $retval    .= "$out_tstamp $out_value\n";
+                  else {                                                                  # generating plots
+                      $out_tstamp =~ s/\ /_/g;                                            # needed by generating plots
+                      $retval    .= "$out_tstamp $out_value\n" if(defined  $out_value);   # V 5.10.1
                       $retval    .= $retvaldummy;
                   }
               }
 
-              if (Scalar::Util::looks_like_number($sql_value)) {                  # nur setzen wenn numerisch
+              if (Scalar::Util::looks_like_number($sql_value)) {                          # nur setzen wenn numerisch
                   if ($deltacalc) {
                       if (Scalar::Util::looks_like_number($out_value)) {
                           if ($out_value < $min[$i]) {
diff --git a/fhem/FHEM/93_DbRep.pm b/fhem/FHEM/93_DbRep.pm
index 46b3c3bda..f4537b103 100644
--- a/fhem/FHEM/93_DbRep.pm
+++ b/fhem/FHEM/93_DbRep.pm
@@ -55,10 +55,10 @@ use FHEM::SynoModules::SMUtils qw( evalDecodeJSON );
 
 use IO::Compress::Gzip qw(gzip $GzipError);
 use IO::Uncompress::Gunzip qw(gunzip $GunzipError);
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
 
 # Version History intern
 my %DbRep_vNotesIntern = (
+  "8.53.13" => "25.05.2024  replace Smartmatch Forum:#137776 ",
   "8.53.12" => "09.05.2024  DbRep_dbConnect: change PRAGMA temp_store=MEMORY to FILE, Forum: https://forum.fhem.de/index.php?msg=1312722 ",
   "8.53.11" => "08.05.2024  reduceLog: fix bug if EXCL/INCL-devices end with a digit ",  
   "8.53.10" => "27.03.2024  multicmd: add attr seqDoubletsVariance ",            
@@ -1762,7 +1762,7 @@ sub DbRep_Attr {
                           previous_hour_end
                          );
 
-            if ($aVal ~~ @dtas) {
+            if (grep /^$aVal$/, @dtas) {      
                 delete($attr{$name}{timeDiffToNow});
                 delete($attr{$name}{timeOlderThan});
                 delete($attr{$name}{timeYearPeriod});