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

G802

Browse Source
This commit is contained in:
Alessandro Battilani
2021-11-04 21:59:58 +01:00
parent 4265ee6914
commit bd53e2886e
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
LoadCSVData.pl
View File

@@ -28,10 +28,11 @@ my (
$tool, $toolbatt, $tooltemp, $tooltype, @channels, $tool, $toolbatt, $tooltemp, $tooltype, @channels,
@NewData, @ain, @din, @nodetype, $GDEventDate @NewData, @ain, @din, @nodetype, $GDEventDate
); );
my $matlab_ip = "160.78.21.71"; my $matlab_proxy_ssh = "80.211.107.201";
my $matlab_cmd = "matlab.cmd"; my $matlab_proxy_ssh_port = 2222;
my $matlab_timestamp = ""; my $matlab_cmd = "";
my $ftp_send = 1; my $matlab_timestamp = "";
my $ftp_send = 1;
my $ftp_addrs; my $ftp_addrs;
my $ftp_user; my $ftp_user;
my $ftp_passwd; my $ftp_passwd;
@@ -133,12 +134,15 @@ sub matlabCalc {
#print $ENV{"HOME"} . "\n"; #print $ENV{"HOME"} . "\n";
$ENV{"HOME"} = "/" . $ENV{"HOME"}; $ENV{"HOME"} = "/" . $ENV{"HOME"};
chdir($matlab_func_dir)
or die "cannot change: $!\n"; #chdir($matlab_func_dir)
# or die "cannot change: $!\n";
print getTimeStamp("log") print getTimeStamp("log")
. " - pid $$ >> current dir: $matlab_func_dir\n"; . " - pid $$ >> current dir: $matlab_func_dir\n";
my @args = my @args = (
( 'timeout', $matlab_timeout, $matlab_cmd, $matlab_rt, $unit, $tool ); 'cd', $matlab_func_dir, '; timeout', $matlab_timeout,
$matlab_cmd, $matlab_rt, $unit, $tool
);
if ( system(@args) != 0 ) { if ( system(@args) != 0 ) {
open( my $fh, '<', $MatlabErrorFilename ) open( my $fh, '<', $MatlabErrorFilename )
or warn print getTimeStamp("log") or warn print getTimeStamp("log")
@@ -171,18 +175,6 @@ sub matlabCalc {
exit(1); exit(1);
} }
} }
else {
$matlab_cmd = 'matlab_' . uc $matlab_cmd . '.cmd';
my @out_matlab = `ssh1 $matlab_ip 'cmd /c $matlab_cmd ' $tool`;
if ( index( $out_matlab[-1], "Failure" ) != -1 ) {
print getTimeStamp("log")
. " - pid $$ >> $unit - $tool MatLab calc failed.\n";
makeEmailMsg();
emailSend();
print getTimeStamp("log") . " - pid $$ >> Execution ended.\n";
exit(1);
}
}
print getTimeStamp("log") print getTimeStamp("log")
. " - pid $$ >> $unit - $tool MatLab calc executed.\n"; . " - pid $$ >> $unit - $tool MatLab calc executed.\n";
@@ -461,6 +453,13 @@ while ( my $line = <FILE> ) {
. " - pid $$ >> Found $tooltype tool name: $tool\n"; . " - pid $$ >> Found $tooltype tool name: $tool\n";
getNodesType(); getNodesType();
} }
elsif ( defined $info[5] && $info[5] =~ m/^DT\d\d\d\d$/i ) {
$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 ) {
$tool = uc $info[2]; $tool = uc $info[2];
$tooltype = 'LOC'; $tooltype = 'LOC';