diff --git a/.vstags b/.vstags index 0d82eb2..7c57972 100644 --- a/.vstags +++ b/.vstags @@ -7,28 +7,28 @@ checkCompanyDBGrant SetupNewComp.pl 124;" s checkCompanyDBSet SetupNewComp.pl 55;" s emailSend AlertNotReceived.pl 81;" s -emailSend LoadCSVData.pl 364;" s +emailSend LoadCSVData.pl 367;" s emailSend prova_mail.pl 76;" s generateRandomPassword SetupNewComp.pl 46;" s getLoggingTime AlertNotReceived.pl 21;" s -getMatlabCmd LoadCSVData.pl 292;" s -getNodesType LoadCSVData.pl 233;" s +getMatlabCmd LoadCSVData.pl 295;" s +getNodesType LoadCSVData.pl 234;" s getTimeStamp LoadCSVData.pl 49;" s getTimeStamp SetupNewComp.pl 26;" s getTimeStamp UnitCsvReceiverSmart.pl 14;" s getTimeStamp aruba/UnitCsvReceiverSmart.pl 15;" s getTimeStamp aruba/UnitCsvRetransmit.pl 14;" s getTimeStamp prova_mail.pl 17;" s -getUdbPwd LoadCSVData.pl 268;" s +getUdbPwd LoadCSVData.pl 271;" s getUnitName UnitCsvReceiverSmart.pl 28;" s getUnitName aruba/UnitCsvReceiverSmart.pl 29;" s makeEmailMsg AlertNotReceived.pl 28;" s -makeEmailMsg LoadCSVData.pl 322;" s +makeEmailMsg LoadCSVData.pl 325;" s makeEmailMsg prova_mail.pl 36;" s matlabCalc LoadCSVData.pl 91;" s setCompanyDBGrant SetupNewComp.pl 151;" s setCompanyDBSet SetupNewComp.pl 96;" s setCompanyDBTables SetupNewComp.pl 192;" s setCompanyOSSet SetupNewComp.pl 343;" s -trxelab LoadCSVData.pl 133;" s +trxelab LoadCSVData.pl 134;" s writeOutSql LoadCSVData.pl 64;" s diff --git a/LoadCSVData.pl b/LoadCSVData.pl index dbe0900..eeae062 100644 --- a/LoadCSVData.pl +++ b/LoadCSVData.pl @@ -99,6 +99,7 @@ sub matlabCalc { $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); if (system(@args) != 0) { my $exit_value = $? >> 8; @@ -177,7 +178,7 @@ sub trxelab { select ToolNameID, EventDate, EventTime, NodeNum, NodeType, NodeDepth, XShift, YShift, ZShift , X, Y, Z, HShift, HShiftDir, HShift_local, speed, speed_local, acceleration, acceleration_local, T_node, water_level, pressure, load_value, AlfaX, AlfaY, calcerr - from ElabDataView + from elabdataview where UnitName = '$unit' and ToolNameID = '$tool' and updated_at > '$matlab_timestamp' order by ToolNameID DESC, EventDate, EventTime, convert(`NodeNum`, UNSIGNED INTEGER) DESC ) resulting_set @@ -454,18 +455,36 @@ while ( my $line = ) { #$NodeData =~ s/\r\n\z//; - if ( $tooltype eq "MUX" or $tooltype eq "MUSA" ) { + if ( $tooltype eq "MUX" ) { #$NodeData =~ s/Dis\./N\/A/g; @NewData = grep /\S/, split( /\||;/, $NodeData ); + my $idx = 0; + $CSVData[ $idx++ ] = join( ';', splice( @NewData, 0, 2 ) ); foreach my $ch (@channels) { $CSVData[ $idx++ ] = join( ';', splice( @NewData, 0, $ch ) ); } - #print Dumper \@CSVData; + }elsif ( $tooltype eq "MUSA" ) { + + #$NodeData =~ s/Dis\./N\/A/g; + my @tmpData = grep /\S/, split( /\||;/, $NodeData ); + my $tmpBatt = shift @tmpData; + @NewData = ($tmpBatt, $tmpData[0], @tmpData); + + my $idx = 0; + + $CSVData[ $idx++ ] = join( ';', splice( @NewData, 0, 2 ) ); + foreach my $ch (@channels) { + $CSVData[ $idx++ ] = + join( ';', splice( @NewData, 0, $ch ) ); + } + + print Dumper \@CSVData; + #print Dumper \@channels; #print Dumper \@din; }elsif ( $tooltype eq "LOC" ) {