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

g301 con timestamp prima

Browse Source
This commit is contained in:
Alessandro Battilani
2021-11-11 20:02:47 +01:00
parent 265fa50091
commit 97f8e869a1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LoadCSVData.pl
View File

@@ -141,7 +141,7 @@ sub matlabCalc {
#my $args = "sh -c \'cd $matlab_func_dir; pwd; $cmd_elab\'"; #my $args = "sh -c \'cd $matlab_func_dir; pwd; $cmd_elab\'";
my $args = my $args =
"ssh $matlab_proxy_ssh -p $matlab_proxy_ssh_port \"sh -c \'cd $matlab_func_dir; pwd; $cmd_elab\'\""; "ssh $matlab_proxy_ssh -p $matlab_proxy_ssh_port \"sh -c \'cd $matlab_func_dir; $cmd_elab\'\"";
if ( system($args) != 0 ) { if ( system($args) != 0 ) {
open( my $fh, '<', $MatlabErrorFilename ) open( my $fh, '<', $MatlabErrorFilename )
@@ -431,7 +431,7 @@ 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/^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 @strings = $filecsvname =~ /(.{1,4})_(.{1,6})_(.{1,6}).*/; my @strings = $filecsvname =~ /(.{1,4})_(.{1,6})_(.{1,6}).*/;
$unittype = $strings[0]; $unittype = $strings[0];
$unit = $strings[1]; $unit = $strings[1];

6
UnitCsvReceiverSmart.pl
View File

@@ -59,7 +59,7 @@ sub getUnitName { # parm => file received ($trfile)
$unittype = $strings[0]; $unittype = $strings[0];
$unit = $strings[1]; $unit = $strings[1];
} }
elsif ( $filenamecsv =~ m/^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 @strings = $filenamecsv =~ /(.{1,4})_(.{1,6})_(.{1,6}).*/; my @strings = $filenamecsv =~ /(.{1,4})_(.{1,6})_(.{1,6}).*/;
$unittype = $strings[0]; $unittype = $strings[0];
$unit = $strings[1]; $unit = $strings[1];
@@ -107,7 +107,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 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/^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 )
@@ -149,7 +149,7 @@ 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/^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