From 6c1c19e52f71c7ea06fbedc99044eb49b9b3dfa4 Mon Sep 17 00:00:00 2001 From: battilo Date: Sat, 24 Nov 2018 00:22:30 +0100 Subject: [PATCH] exit fi no Ain Din Node defined --- LoadCSVData.pl | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/LoadCSVData.pl b/LoadCSVData.pl index f0c384e..dbe0900 100644 --- a/LoadCSVData.pl +++ b/LoadCSVData.pl @@ -246,7 +246,9 @@ sub getNodesType { $sth->execute(); print getTimeStamp("log"). " - pid $$ >> $unit - $tool: " . $sth->rows . " rows selected to get node type/Ain/Din/channels.\n"; if ( $sth->rows eq 0 ) { - die getTimeStamp("log") . " - pid $$ >> No node channels selected.\n"; + print getTimeStamp("log"). " - pid $$ >> Node/Channels/Ain/Din not defined.\n"; + print getTimeStamp("log"). " - pid $$ >> Execution ended.\n"; + exit; }else { my $row = 0; while ( my $results = $sth->fetchrow_hashref ) { @@ -470,12 +472,6 @@ while ( my $line = ) { my ( $Vbat, $Tmod, $Ain1, $Ain2, $Din1, $Din2 ) = split( /;/, $NodeData ); - if ( scalar @din ) { - print getTimeStamp("log"). " - pid $$ >> Ain/Din not defined.\n"; - print getTimeStamp("log"). " - pid $$ >> Execution ended.\n"; - exit; - } - my $idx = 0; $CSVData[$idx++] = $Vbat . ";" . $Tmod;