From e4f62ea960c92d473056f705fb7dbeafc4e5ed6a Mon Sep 17 00:00:00 2001 From: Alessandro Battilani Date: Sun, 19 Dec 2021 16:43:34 +0100 Subject: [PATCH] allineati a cr1000x --- LoadCSVData.pl | 26 +++++++++++++++++++++++++- SendFtpElabData.pl | 7 +++---- UnitCsvReceiverSmart.pl | 17 +++++++++++++++-- 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/LoadCSVData.pl b/LoadCSVData.pl index 475f6a9..4f562b4 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 @@ -431,6 +431,13 @@ elsif ( $filecsvname =~ m/^D2W_ID\d\d\d\d_DT\d\d\d\d_\d*$/i ) { $tool = $strings[2]; $tooltype = 'D2W'; } +elsif ( $filecsvname =~ m/^CR1000X_ID\d\d\d\d_DT\d\d\d\d_\d*$/i ) { + my @strings = $filecsvname =~ /(.{1,7})_(.{1,6})_(.{1,6}).*/; + $unittype = $strings[0]; + $unit = $strings[1]; + $tool = $strings[2]; + $tooltype = 'CR1000X'; +} elsif ( $filecsvname =~ m/^(\d*_|)(G301_ID\d\d\d\d_DT\d\d\d\d_\d*)$/i ) { my $filecsvname_clean = substr( $filecsvname, index( $filecsvname, "G301" ) ); @@ -443,9 +450,12 @@ elsif ( $filecsvname =~ m/^(\d*_|)(G301_ID\d\d\d\d_DT\d\d\d\d_\d*)$/i ) { while ( my $line = ) { if ( $line =~ m/\A [[:ascii:]]* \Z/xms ) { + $line =~ tr /\,/\;/ if ( $line =~ m/^\"\d\d\d\d.*/i ); #CR1000X + $line =~ s/\"//g; my ( $first, $NodeData ) = split( /;/, $line, 2 ); if ( defined $first and ( $first ne '' ) ) { $first =~ s/;+$//; + $first =~ tr /\-/\//; if ( !defined $NodeData or ( $NodeData =~ m/^;+/ ) ) { my @info = ( split( /[\/,\.]/, $first ) ); if ( defined $info[3] && $info[3] =~ m/^DT\d\d\d\d$/i ) { #G801 @@ -502,6 +512,12 @@ while ( my $line = ) { getNodesType(); $D2W_fcheck = 1; } + if ( $unittype eq 'CR1000X' and $CR1000X_fcheck eq 0 ) { + print getTimeStamp("log") + . " - pid $$ >> Found $tooltype tool name: $tool\n"; + getNodesType(); + $CR1000X_fcheck = 1; + } if ( $unittype eq 'G301' and $G301_fcheck eq 0 ) { print getTimeStamp("log") . " - pid $$ >> Found $tooltype tool name: $tool\n"; @@ -527,6 +543,14 @@ while ( my $line = ) { } } } + elsif ( $tooltype eq "CR1000X" ) + { # può essere tolto per attivarlo + @CSVData = split( /\|/, $NodeData ); + print getTimeStamp("log") + . " - pid $$ >> TEST CR1000X Execution ended.\n"; + exit; + } + elsif ( $tooltype eq "MUSA" ) { #$NodeData =~ s/Dis\./N\/A/g; 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; diff --git a/UnitCsvReceiverSmart.pl b/UnitCsvReceiverSmart.pl index 4c81adb..7c812d4 100644 --- a/UnitCsvReceiverSmart.pl +++ b/UnitCsvReceiverSmart.pl @@ -54,11 +54,20 @@ sub getUnitName { # parm => file received ($trfile) elsif ( $filenamecsv =~ m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i ) { $unittype = "NESA"; } + elsif ( $filenamecsv =~ m/^\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d$/i ) + { # nesa file con serial number centralina + $unittype = "NESA"; + } elsif ( $filenamecsv =~ m/^D2W_ID\d\d\d\d_DT\d\d\d\d$/i ) { my @strings = $filenamecsv =~ /(.{1,3})_(.{1,6})_(.{1,6}).*/; $unittype = $strings[0]; $unit = $strings[1]; } + elsif ( $filenamecsv =~ m/^CR1000X_ID\d\d\d\d_DT\d\d\d\d$/i ) { + my @strings = $filenamecsv =~ /(.{1,7})_(.{1,6})_(.{1,6}).*/; + $unittype = $strings[0]; + $unit = $strings[1]; + } elsif ( $filenamecsv =~ m/^(\d*_|)G301_ID\d\d\d\d_DT\d\d\d\d$/i ) { my $filecsvname_clean = substr( $filenamecsv, index( $filenamecsv, "G301" ) ); @@ -109,10 +118,11 @@ while ( my $line = $tail->GetLine() ) { m/^(\d\d_\d\d\d\d_|)(DT\d\d\d\d|LOC\d\d\d\d|GD\d\d\d\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/^CR1000X_ID\d\d\d\d_DT\d\d\d\d$/i or $filename =~ m/^(\d*_|)G301_ID\d\d\d\d_DT\d\d\d\d$/i or $filename =~ m/^GFLOW_ID\d\d\d\d_DT\d\d\d\d_\d*$/i - or $filename =~ - m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i ) + or $filename =~ m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i + or $filename =~ m/^\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d$/i ) ) { @@ -151,10 +161,13 @@ 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/^CR1000X_ID\d\d\d\d_DT\d\d\d\d$/i or $filename =~ m/^(\d*_|)G301_ID\d\d\d\d_DT\d\d\d\d$/i or $filename =~ m/^GFLOW_ID\d\d\d\d_DT\d\d\d\d_\d*$/i or $filename =~ m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i + or $filename =~ + m/^\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d$/i ) and ( $unit ne 'ID9999' ) and ( $truser ne 'corra' )