From ff3da9be7fecc9ab6039b94b1cab63adc1db9128 Mon Sep 17 00:00:00 2001
From: Alessandro Battilani <alessandro.battilani@gmail.com>
Date: Sun, 28 Nov 2021 15:39:38 +0100
Subject: [PATCH] errore ctrl send ftp e query sxclude anchor e none

---
 LoadCSVData.pl     | 9 ++++-----
 SendFtpElabData.pl | 7 +++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/LoadCSVData.pl b/LoadCSVData.pl
index 08cea7b..564c714 100755
--- a/LoadCSVData.pl
+++ b/LoadCSVData.pl
@@ -207,7 +207,7 @@ sub getNodesType {
                            inner join tools as t on t.id = n.tool_id
                            inner join units as u on u.id = t.unit_id
                            inner join nodetypes as y on n.nodetype_id = y.id
-                           where t.name = "'
+                           where y.type not in (\'Anchor Link\', \'None\') and t.name = "'
           . $tool
           . '" and u.name = "'
           . $unit
@@ -522,10 +522,9 @@ while ( my $line = <FILE> ) {
                         $CSVData[ $idx++ ] =
                           join( ';', splice( @NewData, 0, 2 ) );
                         foreach my $ch (@channels) {
-                            if ( $ch > 0 ) {
-                                $CSVData[ $idx++ ] =
-                                  join( ';', splice( @NewData, 0, $ch ) );
-                            }
+                            $CSVData[ $idx++ ] =
+                              join( ';', splice( @NewData, 0, $ch ) );
+
                         }
                     }
 
diff --git a/SendFtpElabData.pl b/SendFtpElabData.pl
index 5fc68e4..6a14eec 100755
--- a/SendFtpElabData.pl
+++ b/SendFtpElabData.pl
@@ -72,7 +72,7 @@ sub trxelab {
 
     my $fileelab;
 
-    if ( !defined($ftp_filename) or $ftp_filename eq "" ) {
+    if ( !defined $ftp_filename or $ftp_filename eq "" ) {
         $fileelab =
             '/var/lib/mysql-files/'
           . $tool . '_'
@@ -123,8 +123,7 @@ sub trxelab {
     print getTimeStamp("log") . " - pid $$ >> $unit - $tool ftp parm:\n";
 
     while ( my ( $key, $value ) = each(%ftp_parms) ) {
-        print getTimeStamp("log")
-          . " - pid $$ >> - $key = $ftp_parms{$key}\n";
+        print getTimeStamp("log") . " - pid $$ >> - $key = $ftp_parms{$key}\n";
     }
 
     if (   !defined $duedate
@@ -195,4 +194,4 @@ if ( $tool eq 'DT0076' ) {
 trxelab();
 
 print getTimeStamp("log") . " - pid $$ >> Execution ended.\n";
-exit;
\ No newline at end of file
+exit;