From fe6312a615be2b7e58bcb6930c01e653ab10426d Mon Sep 17 00:00:00 2001
From: Alessandro Battilani <alessandro.battilani@gmail.com>
Date: Wed, 6 Jan 2021 18:09:51 +0100
Subject: [PATCH] errors e warnings separati - errors rossi

---
 LoadCSVData.pl | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/LoadCSVData.pl b/LoadCSVData.pl
index a4ef483..a64d011 100755
--- a/LoadCSVData.pl
+++ b/LoadCSVData.pl
@@ -54,7 +54,11 @@ my $D2W_fcheck       = 0;
 my $FtpToCustomerCmd = 'SendFtpElabData.pl';
 my ( $scriptname, $scriptpath );
 my $MatlabErrorFilename = "/tmp/";
-my $matlabOutputError   = '';
+my @matlabOutputErrorArray;
+my @errors;
+my @warnings;
+my $MatlabErrors   = '';
+my $MatlabWarnings = '';
 
 sub getTimeStamp
 {    # parm [ts] => timestamp for filename; log => timestamp for log
@@ -133,12 +137,16 @@ sub matlabCalc {
               or warn print getTimeStamp("log")
               . " - pid $$ >> Cannot open Matlab output error file: ${MatlabErrorFilename}\n";
             {
-                local $/;
-                $matlabOutputError = <$fh>;
+                chomp( @matlabOutputErrorArray = <$fh> );
             }
             close($fh);
-            $matlabOutputError =~ s/\n/<br>/g;
+            @matlabOutputErrorArray = grep( /\S/,     @matlabOutputErrorArray );
+            @errors                 = grep( /^Error/, @matlabOutputErrorArray );
+            @warnings       = grep( !/^Error/, @matlabOutputErrorArray );
+            $MatlabErrors   = join( "<br>", @errors );
+            $MatlabWarnings = join( "<br>", @warnings );
             my $exit_value = $? >> 8;
+
             if ( $exit_value == 124 ) {
                 print getTimeStamp("log")
                   . " - pid $$ >> system @args excessive duration: killed after $matlab_timeout seconds\n";
@@ -328,9 +336,14 @@ sub makeEmailMsg {
 				<h4 style="margin: 5px;">$matlab_error</h4>
 			</td>
 		</tr>
+		<tr>
+			<td style="padding: 20px; padding-bottom: 0px; color: red">
+				$MatlabErrors
+			</td>
+		</tr>
 		<tr>
 			<td style="padding: 20px;">
-				$matlabOutputError
+				$MatlabWarnings
 			</td>
 		</tr>
 	</table>