This commit is contained in:
2021-11-06 18:24:30 +01:00
parent 94f7f54f9a
commit db2d44e8f1

View File

@@ -28,8 +28,8 @@ my (
$tool, $toolbatt, $tooltemp, $tooltype, @channels,
@NewData, @ain, @din, @nodetype, $GDEventDate
);
my $matlab_proxy_ssh = "80.211.107.201";
my $matlab_proxy_ssh_port = 2222;
my $matlab_proxy_ssh = "localhost"; #"80.211.107.201";
my $matlab_proxy_ssh_port = 22; #2222;
my $matlab_cmd = "";
my $matlab_timestamp = "";
my $ftp_send = 1;
@@ -135,11 +135,20 @@ sub matlabCalc {
#print $ENV{"HOME"} . "\n";
$ENV{"HOME"} = "/" . $ENV{"HOME"};
chdir($matlab_func_dir)
or die "cannot change: $!\n";
print getTimeStamp("log")
. " - pid $$ >> current dir: $matlab_func_dir\n";
my $args = "timeout $matlab_timeout $matlab_cmd $matlab_rt $unit $tool";
#chdir($matlab_func_dir)
# or die "cannot change: $!\n";
#print getTimeStamp("log")
# . " - pid $$ >> current dir: $matlab_func_dir\n";
my $cmd_elab =
"timeout $matlab_timeout $matlab_cmd $matlab_rt $unit $tool";
my $args = "sh -c \'cd $matlab_func_dir; pwd; $cmd_elab\'";
#my $args = "ssh $matlab_proxy_ssh -p $matlab_proxy_ssh_port sh -c \'cd $matlab_func_dir; $cmd_elab\'";
#my $args = "timeout $matlab_timeout $matlab_cmd $matlab_rt $unit $tool";
if ( system($args) != 0 ) {
open( my $fh, '<', $MatlabErrorFilename )
or warn print getTimeStamp("log")
@@ -443,27 +452,36 @@ while ( my $line = <FILE> ) {
$first =~ s/;+$//;
if ( !defined $NodeData or ( $NodeData =~ m/^;+/ ) ) {
my @info = ( split( /[\/,\.]/, $first ) );
if ( defined $info[3] && $info[3] =~ m/^DT\d\d\d\d$/i ) {
if ( defined $info[3] && $info[3] =~ m/^DT\d\d\d\d$/i ) { #G801
$tool = uc $info[3];
$tooltype = uc $info[2];
print getTimeStamp("log")
. " - pid $$ >> Found $tooltype tool name: $tool\n";
getNodesType();
}
elsif ( defined $info[5] && $info[5] =~ m/^DT\d\d\d\d$/i ) {
elsif ( defined $info[5] && $info[5] =~ m/^DT\d\d\d\d$/i )
{ #G802
$tool = uc $info[5];
$tooltype = uc $info[4];
print getTimeStamp("log")
. " - pid $$ >> Found $tooltype tool name: $tool\n";
getNodesType();
}
elsif ( defined $info[2] && $info[2] =~ m/^LOC\d*$/i ) {
elsif ( defined $info[2] && $info[2] =~ m/^LOC\d*$/i ) { #G801
$tool = uc $info[2];
$tooltype = 'LOC';
print getTimeStamp("log")
. " - pid $$ >> Found $tooltype tool name: $tool\n";
getNodesType();
}
elsif ( defined $info[4] && $info[4] =~ m/^LOC\d*$/i ) { #G802
$tool = uc $info[4];
$tooltype = 'LOC';
print getTimeStamp("log")
. " - pid $$ >> Found $tooltype tool name: $tool\n";
getNodesType();
}
elsif ( defined $info[3] && $info[3] =~ m/^GD\d*$/i ) {
$tool = uc $info[3];
$tooltype = 'GD';