From a8d6e04bd99afce80c185e6d46527be88c1d9fae Mon Sep 17 00:00:00 2001 From: Alessandro Battilani Date: Mon, 19 Apr 2021 22:37:36 +0200 Subject: [PATCH] gestione G301 --- LoadCSVData.pl | 18 ++++++++++++++++-- UnitCsvReceiverSmart.pl | 9 ++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/LoadCSVData.pl b/LoadCSVData.pl index 588d354..d9ad8d5 100755 --- a/LoadCSVData.pl +++ b/LoadCSVData.pl @@ -51,6 +51,7 @@ my $from = 'ASE Alert System'; my ( $email_msg, $email_obj ); my $G201_fcheck = 0; my $D2W_fcheck = 0; +my $G301_fcheck = 0; my $FtpToCustomerCmd = 'SendFtpElabData.pl'; my ( $scriptname, $scriptpath ); my $MatlabErrorFilename = "/tmp/"; @@ -436,7 +437,14 @@ elsif ( $filecsvname =~ m/^D2W_ID\d\d\d\d_DT\d\d\d\d_\d*$/i ) { $unittype = $strings[0]; $unit = $strings[1]; $tool = $strings[2]; - $tooltype = 'D2W'; + $tooltype = 'MUX'; +} +elsif ( $filecsvname =~ m/^G301_ID\d\d\d\d_DT\d\d\d\d_\d*$/i ) { + my @strings = $filecsvname =~ /(.{1,3})_(.{1,6})_(.{1,6}).*/; + $unittype = $strings[0]; + $unit = $strings[1]; + $tool = $strings[2]; + $tooltype = 'MUX'; # inserire tooltype corretto } while ( my $line = ) { @@ -483,8 +491,14 @@ while ( my $line = ) { getNodesType(); $D2W_fcheck = 1; } + if ( $unittype eq 'G301' and $G301_fcheck eq 0 ) { + print getTimeStamp("log") + . " - pid $$ >> Found $tooltype tool name: $tool\n"; + getNodesType(); + $G301_fcheck = 1; + } - if ( $tooltype eq "MUX" or $tooltype eq "D2W" ) { + if ( $tooltype eq "MUX" ) { #$NodeData =~ s/Dis\./N\/A/g; @NewData = grep /\S/, split( /\||;/, $NodeData ); diff --git a/UnitCsvReceiverSmart.pl b/UnitCsvReceiverSmart.pl index f16a32f..5e2b2c7 100644 --- a/UnitCsvReceiverSmart.pl +++ b/UnitCsvReceiverSmart.pl @@ -43,6 +43,11 @@ sub getUnitName { # parm => file received ($trfile) $unittype = $strings[0]; $unit = $strings[1]; } + elsif ( $filenamecsv =~ m/^G301_ID\d\d\d\d_DT\d\d\d\d$/i ) { + my @strings = $filenamecsv =~ /(.{1,4})_(.{1,6})_(.{1,6}).*/; + $unittype = $strings[0]; + $unit = $strings[1]; + } else { open FILE, $filename or warn getTimeStamp("log") @@ -84,7 +89,8 @@ while ( my $line = $tail->GetLine() ) { ( ( uc $suffix ) eq ( uc $ext ) ) and ( $filename =~ m/^(\d\d_\d\d\d\d_|)(DT\d\d\d\d|LOC\d*|GD\d*)$/i or $filename =~ m/^G201_ID\d\d\d\d_DT\d\d\d\d_\d*$/i - or $filename =~ m/^D2W_ID\d\d\d\d_DT\d\d\d\d$/i ) + or $filename =~ m/^D2W_ID\d\d\d\d_DT\d\d\d\d$/i + or $filename =~ m/^G301_ID\d\d\d\d_DT\d\d\d\d$/i ) ) { my $unit = getUnitName($trfile); @@ -122,6 +128,7 @@ while ( my $line = $tail->GetLine() ) { m/^(\d\d_\d\d\d\d_|)(DT\d\d\d\d|LOC\d.*|GD\d*)$/i or $filename =~ m/^G201_ID\d\d\d\d_DT\d\d\d\d_\d*$/i or $filename =~ m/^D2W_ID\d\d\d\d_DT\d\d\d\d$/i + or $filename =~ m/^G301_ID\d\d\d\d_DT\d\d\d\d$/i ) and ( $unit ne 'ID9999' ) and ( $truser ne 'corra' )