aggiunta gestione nesa
This commit is contained in:
@@ -30,6 +30,11 @@ sub getUnitName { # parm => file received ($trfile)
|
|||||||
my ( $fileDate, $fileTime );
|
my ( $fileDate, $fileTime );
|
||||||
my ( $unittype, $unit );
|
my ( $unittype, $unit );
|
||||||
my ( $filenamecsv, $path, $suffix ) = fileparse( $filename, qr/\.[^.]*/ );
|
my ( $filenamecsv, $path, $suffix ) = fileparse( $filename, qr/\.[^.]*/ );
|
||||||
|
if ( $path =~ m/ID\d\d\d\d\/*$/i ) {
|
||||||
|
my @strings = $path =~ /.*\/(ID.{1,4})\/*$/;
|
||||||
|
$unit = $strings[0];
|
||||||
|
}
|
||||||
|
|
||||||
if ( $filenamecsv =~ m/^G201_ID\d\d\d\d_DT\d\d\d\d_\d*$/i ) {
|
if ( $filenamecsv =~ m/^G201_ID\d\d\d\d_DT\d\d\d\d_\d*$/i ) {
|
||||||
my @strings = $filenamecsv =~
|
my @strings = $filenamecsv =~
|
||||||
/(.{1,4})_(.{1,6})_(.{1,6})_(.{1,4})(.{1,2})(.{1,2})(.{1,2})(.{1,2})(.{1,2}).*/;
|
/(.{1,4})_(.{1,6})_(.{1,6})_(.{1,4})(.{1,2})(.{1,2})(.{1,2})(.{1,2})(.{1,2}).*/;
|
||||||
@@ -46,6 +51,9 @@ sub getUnitName { # parm => file received ($trfile)
|
|||||||
$fileDate = $strings[3] . "/" . $strings[4] . "/" . $strings[5];
|
$fileDate = $strings[3] . "/" . $strings[4] . "/" . $strings[5];
|
||||||
$fileTime = $strings[6] . ":" . $strings[7] . ":" . $strings[8];
|
$fileTime = $strings[6] . ":" . $strings[7] . ":" . $strings[8];
|
||||||
}
|
}
|
||||||
|
elsif ( $filenamecsv =~ m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i ) {
|
||||||
|
$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];
|
||||||
@@ -100,8 +108,11 @@ while ( my $line = $tail->GetLine() ) {
|
|||||||
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/^G301_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
|
||||||
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 =~
|
||||||
|
m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i )
|
||||||
)
|
)
|
||||||
|
|
||||||
{
|
{
|
||||||
my ( $unit, $unittype ) = getUnitName($trfile);
|
my ( $unit, $unittype ) = getUnitName($trfile);
|
||||||
print getTimeStamp("log") . " >> Unit $unit - Filename $trfile\n";
|
print getTimeStamp("log") . " >> Unit $unit - Filename $trfile\n";
|
||||||
@@ -140,6 +151,8 @@ while ( my $line = $tail->GetLine() ) {
|
|||||||
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
|
or $filename =~ m/^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 =~
|
||||||
|
m/^measurements_\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' )
|
||||||
@@ -153,10 +166,17 @@ while ( my $line = $tail->GetLine() ) {
|
|||||||
$ENV{"HOME"} = 'home/' . $truser;
|
$ENV{"HOME"} = 'home/' . $truser;
|
||||||
if ( $unittype eq 'GFLOW' ) {
|
if ( $unittype eq 'GFLOW' ) {
|
||||||
|
|
||||||
exec( $scriptpath
|
exec( $scriptpath
|
||||||
. "gflowScript.py \"$dest\" >> /home/$truser/log/loadgflow.log 2>&1"
|
. "gflowScript.py \"$dest\" >> /home/$truser/log/loadgflow.log 2>&1"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
}
|
||||||
|
elsif ( $unittype eq 'NESA' ) {
|
||||||
|
|
||||||
|
exec( $scriptpath
|
||||||
|
. "nesaScript.py \"$dest\" >> /home/$truser/log/loadnesa.log 2>&1"
|
||||||
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
exec( $scriptpath
|
exec( $scriptpath
|
||||||
|
|||||||
Reference in New Issue
Block a user