alex/ase_perl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allineati a cr1000x

Browse Source
This commit is contained in:
Alessandro Battilani
2021-12-19 16:43:34 +01:00
parent 1a1183fa41
commit e4f62ea960
3 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
LoadCSVData.pl
View File

@@ -207,7 +207,7 @@ sub getNodesType {
inner join tools as t on t.id = n.tool_id inner join tools as t on t.id = n.tool_id
inner join units as u on u.id = t.unit_id inner join units as u on u.id = t.unit_id
inner join nodetypes as y on n.nodetype_id = y.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 . $tool
. '" and u.name = "' . '" and u.name = "'
. $unit . $unit
@@ -431,6 +431,13 @@ elsif ( $filecsvname =~ m/^D2W_ID\d\d\d\d_DT\d\d\d\d_\d*$/i ) {
$tool = $strings[2]; $tool = $strings[2];
$tooltype = 'D2W'; $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 ) { elsif ( $filecsvname =~ m/^(\d*_|)(G301_ID\d\d\d\d_DT\d\d\d\d_\d*)$/i ) {
my $filecsvname_clean = my $filecsvname_clean =
substr( $filecsvname, index( $filecsvname, "G301" ) ); 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 = <FILE> ) { while ( my $line = <FILE> ) {
if ( $line =~ m/\A [[:ascii:]]* \Z/xms ) { 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 ); my ( $first, $NodeData ) = split( /;/, $line, 2 );
if ( defined $first and ( $first ne '' ) ) { if ( defined $first and ( $first ne '' ) ) {
$first =~ s/;+$//; $first =~ s/;+$//;
$first =~ tr /\-/\//;
if ( !defined $NodeData or ( $NodeData =~ m/^;+/ ) ) { if ( !defined $NodeData or ( $NodeData =~ m/^;+/ ) ) {
my @info = ( split( /[\/,\.]/, $first ) ); my @info = ( split( /[\/,\.]/, $first ) );
if ( defined $info[3] && $info[3] =~ m/^DT\d\d\d\d$/i ) { #G801 if ( defined $info[3] && $info[3] =~ m/^DT\d\d\d\d$/i ) { #G801
@@ -502,6 +512,12 @@ while ( my $line = <FILE> ) {
getNodesType(); getNodesType();
$D2W_fcheck = 1; $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 ) { if ( $unittype eq 'G301' and $G301_fcheck eq 0 ) {
print getTimeStamp("log") print getTimeStamp("log")
. " - pid $$ >> Found $tooltype tool name: $tool\n"; . " - pid $$ >> Found $tooltype tool name: $tool\n";
@@ -527,6 +543,14 @@ while ( my $line = <FILE> ) {
} }
} }
} }
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" ) { elsif ( $tooltype eq "MUSA" ) {
#$NodeData =~ s/Dis\./N\/A/g; #$NodeData =~ s/Dis\./N\/A/g;

5
SendFtpElabData.pl
View File

@@ -72,7 +72,7 @@ sub trxelab {
my $fileelab; my $fileelab;
if ( !defined($ftp_filename) or $ftp_filename eq "" ) { if ( !defined $ftp_filename or $ftp_filename eq "" ) {
$fileelab = $fileelab =
'/var/lib/mysql-files/' '/var/lib/mysql-files/'
. $tool . '_' . $tool . '_'
@@ -123,8 +123,7 @@ sub trxelab {
print getTimeStamp("log") . " - pid $$ >> $unit - $tool ftp parm:\n"; print getTimeStamp("log") . " - pid $$ >> $unit - $tool ftp parm:\n";
while ( my ( $key, $value ) = each(%ftp_parms) ) { while ( my ( $key, $value ) = each(%ftp_parms) ) {
print getTimeStamp("log") print getTimeStamp("log") . " - pid $$ >> - $key = $ftp_parms{$key}\n";
. " - pid $$ >> - $key = $ftp_parms{$key}\n";
} }
if ( !defined $duedate if ( !defined $duedate

17
UnitCsvReceiverSmart.pl
View File

@@ -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 ) { elsif ( $filenamecsv =~ m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i ) {
$unittype = "NESA"; $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 ) { elsif ( $filenamecsv =~ m/^D2W_ID\d\d\d\d_DT\d\d\d\d$/i ) {
my @strings = $filenamecsv =~ /(.{1,3})_(.{1,6})_(.{1,6}).*/; my @strings = $filenamecsv =~ /(.{1,3})_(.{1,6})_(.{1,6}).*/;
$unittype = $strings[0]; $unittype = $strings[0];
$unit = $strings[1]; $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 ) { elsif ( $filenamecsv =~ m/^(\d*_|)G301_ID\d\d\d\d_DT\d\d\d\d$/i ) {
my $filecsvname_clean = my $filecsvname_clean =
substr( $filenamecsv, index( $filenamecsv, "G301" ) ); 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 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/^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/^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/^(\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/^GFLOW_ID\d\d\d\d_DT\d\d\d\d_\d*$/i
or $filename =~ or $filename =~ m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i
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 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/^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/^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/^(\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/^GFLOW_ID\d\d\d\d_DT\d\d\d\d_\d*$/i
or $filename =~ or $filename =~
m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i 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 ( $unit ne 'ID9999' )
and ( $truser ne 'corra' ) and ( $truser ne 'corra' )