diff --git a/LoadCSVData.pl b/LoadCSVData.pl index 0f4d54d..caecbba 100644 --- a/LoadCSVData.pl +++ b/LoadCSVData.pl @@ -358,14 +358,11 @@ else { } my ( $filecsvname, $path, $suffix ) = fileparse( $filename, qr/\.[^.]*/ ); -print "$filename\n"; -print "$filecsvname\n"; + if ( $filecsvname =~ m/^(\d\d_\d\d\d\d_|)(DT\d\d\d\d|LOC\d.*|GD\d*)_\d*$/i ) { ($fileDate, $fileTime) = split( /\s/, ); ($unittype, $unit ) = split( /\s/, uc ); $unit =~ s/;+$//; - -print "$unit\n"; } elsif ( $filecsvname =~ 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)_\d*$/i ) { my @strings = $filecsvname =~ /(.{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];; @@ -376,7 +373,6 @@ print "$unit\n"; $tooltype = 'MUX'; } -print "$unit\n"; while ( my $line = ) { my ( $first, $NodeData ) = split( /;/, $line, 2 ); if ( defined $first and ( $first ne '' ) ) {