diff --git a/LoadCSVData.pl b/LoadCSVData.pl index 3210ab0..7ed3888 100644 --- a/LoadCSVData.pl +++ b/LoadCSVData.pl @@ -36,9 +36,8 @@ my $ftp_passwd; my $ftp_parm; my $ftp_filename; my $ftp_target; -my $unit_id; -my $unit; -my $unittype; +my ($unit_id, $unit, $unittype); +my ($fileDate, $fileTime); my $matlab_rt = "/usr/local/MATLAB/MATLAB_Runtime/v93"; my $matlab_func_dir = "/usr/local/matlab_func/"; @@ -356,10 +355,17 @@ if ( $db_name ne 'asega' ) { else { $db_name = 'ase_lar'; } - -my ( $fileDate, $fileTime ) = split( /\s/, ); -($unittype, $unit ) = split( /\s/, uc ); -$unit =~ s/;+$//; +if ( $filename = m/^(\d\d_\d\d\d\d_|)(DT\d\d\d\d|LOC\d.*|GD\d*)$/i ) { # GD801 + ($fileDate, $fileTime) = split( /\s/, ); + ($unittype, $unit ) = split( /\s/, uc ); + $unit =~ s/;+$//; +} elsif ( $filename = m/^(\d\d\d\d\d\d\d\d\d\d\d\d\d\d_)(G201_ID\d\d\d\d_DT\d\d\d\d)$/i ) { # GD201 + my @strings = $filename =~ /(.{1,4})(.{1,2})(.{1,2})(.{1,2})(.{1,2})(.{1,2})_(.{1,4})_(.{1,6})_(.{1,6}).*/; + $fileDate = $strings[0] . "/" . $strings[1] . "/" . $strings[2];; + $fileTime = $strings[3] . ":" . $strings[4] . ":" . $strings[5]; + $unittype = $strings[6]; + $unit = $strings[7]; +} while ( my $line = ) { my ( $first, $NodeData ) = split( /;/, $line, 2 ); diff --git a/prova.pl b/prova.pl index 0027df3..08f3fd2 100755 --- a/prova.pl +++ b/prova.pl @@ -1,8 +1,19 @@ #!/usr/bin/perl use warnings; use strict; +my $string= "20180418103606_G201_ID1111_DT2222.csv"; +my @strings = $string =~ /(.{1,4})(.{1,2})(.{1,2})(.{1,2})(.{1,2})(.{1,2})_(.{1,4})_(.{1,6})_(.{1,6}).*/; +foreach(@strings) { + print "$_\n"; +} -use Data::Dumper qw(Dumper); -my @arr = (2,3,4,5,6); -print scalar @arr . ".\n"; # First way to print array size \ No newline at end of file + my $fileDate = $strings[0] . "/" . $strings[1] . "/" . $strings[2];; + my $fileTime = $strings[3] . ":" . $strings[4] . ":" . $strings[5]; + my $unittype = $strings[6]; + my $unit = $strings[7]; + + print $fileDate . "\n"; + print $fileTime . "\n"; + print $unittype . "\n"; + print $unit . "\n"; \ No newline at end of file