gestione CR1000X
This commit is contained in:
@@ -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 = <FILE> ) {
|
||||
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,13 @@ while ( my $line = <FILE> ) {
|
||||
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";
|
||||
@@ -533,6 +550,15 @@ while ( my $line = <FILE> ) {
|
||||
#print Dumper \@din;
|
||||
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
@@ -63,6 +63,11 @@ sub getUnitName { # parm => file received ($trfile)
|
||||
$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" ) );
|
||||
@@ -113,6 +118,7 @@ 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
|
||||
@@ -155,6 +161,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/^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 =~
|
||||
|
||||
Reference in New Issue
Block a user