diff --git a/mind/UnitCsvRetransmit.pl b/mind/UnitCsvRetransmit.pl old mode 100644 new mode 100755 index 07dc841..e6adb06 --- a/mind/UnitCsvRetransmit.pl +++ b/mind/UnitCsvRetransmit.pl @@ -26,66 +26,35 @@ sub getTimeStamp } my $readingFile; -my $hostname = "160.78.21.55"; +my $hostname = "80.211.60.65"; my $username = 'asega'; my $password = 'mums'; GetOptions( "file=s" => \$readingFile ) or die("Error in command line arguments\n"); -if ( -e $lockfile ) { - my $content; - open( my $fh, '<', $lockfile ) or die "cannot open file $lockfile"; - { - local $/; - $content = <$fh>; - } - close($fh); - if ( $content != $lockTS ) { - print getTimeStamp("log") - . " >> timestamp mismatch... $content - $lockTS ... Exiting. \n"; - exit(0); - } +(my $file2ASE = $readingFile) =~ s/trx2ASE\///; -} -else { - open( FH, '>', $lockfile ) or die $!; - print FH $lockTS; - close(FH); -} +print getTimeStamp("log") . " >> $file2ASE \n"; -if ( index( $readingFile, 'ZZZZZZ.csv' ) > 0 ) { - unlink $lockfile; - exit(0); -} - -print getTimeStamp("log") . " >> $readingFile \n"; - -my ( $scriptname, $scriptpath ) = fileparse($0); -my ( $filename, $path, $suffix ) = fileparse( $readingFile, qr/\.[^.]*/ ); - -my $send = $readingFile =~ s/received/transmitted/r; +my ( $filename, $path, $suffix ) = fileparse( $file2ASE, qr/\.[^.]*/ ); my ( $tool, $trxdate ) = split( /_/, $filename ); -my ( $dmy1, $dmy2, $dmy3, $unit, $dmy4 ) = split( /\//, $path ); +my @dirs = split( /\//, $path ); -print getTimeStamp("log") . " >> Unit $unit - Filename $tool" . "$suffix \n"; +print getTimeStamp("log") . " >> Unit $dirs[-1] - Filename $tool" . "$suffix \n"; -my $ftp = Net::FTP->new( $hostname, Timeout => 20, Debug => 0, Passive => 0 ) +my $ftp = Net::FTP->new( $hostname, Timeout => 20, Debug => 0, Passive => 1 ) or die getTimeStamp("log") . " >> Cannot connect to $hostname: $@"; if ( $ftp->login( $username, $password ) ) { - if ( $ftp->put( $readingFile, $tool . $suffix ) ) { - print getTimeStamp("log") . " >> Put $readingFile completed.\n"; - if ( !move $readingFile, $send ) { - warn getTimeStamp("log") - . " >> Move $readingFile -> $send failed: $!"; - } - else { - print getTimeStamp("log") . " >> Moved $readingFile -> $send.\n"; + if ( $ftp->put( $file2ASE, $tool . $suffix ) ) { + print getTimeStamp("log") . " >> Put $file2ASE completed.\n"; + if (-e $readingFile) { + unlink $readingFile ; } } else { - die getTimeStamp("log") . " >> Put $readingFile failed ", $ftp->message; + die getTimeStamp("log") . " >> Put $file2ASE failed ", $ftp->message; } } else {