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

tolti ; dai file editati

Browse Source
This commit is contained in:
battilo
2017-10-01 11:03:59 +02:00
parent ec228b4cd0
commit 0020087b32
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LoadCSVData.pl
View File

@@ -344,10 +344,12 @@ else {
my ( $fileDate, $fileTime ) = split( /\s/, <FILE> ); my ( $fileDate, $fileTime ) = split( /\s/, <FILE> );
my ( $unittype, $unit ) = split( /\s/, uc <FILE> ); my ( $unittype, $unit ) = split( /\s/, uc <FILE> );
$unit =~ s/;+$//;
while ( my $line = <FILE> ) { while ( my $line = <FILE> ) {
my ( $first, $NodeData ) = split( /;/, $line, 2 ); my ( $first, $NodeData ) = split( /;/, $line, 2 );
if ( defined $first and ( $first ne '' ) ) { if ( defined $first and ( $first ne '' ) ) {
$first =~ s/;+$//;
if ( !defined $NodeData or ( $NodeData =~ m/^;+/ ) ) { if ( !defined $NodeData or ( $NodeData =~ m/^;+/ ) ) {
my @info = ( split( /[\/,\.]/, $first ) ); my @info = ( split( /[\/,\.]/, $first ) );
if ( defined $info[3] && $info[3] =~ m/^DT\d\d\d\d$/i ) { if ( defined $info[3] && $info[3] =~ m/^DT\d\d\d\d$/i ) {
@@ -373,6 +375,7 @@ while ( my $line = <FILE> ) {
} }
else { else {
$NodeData =~ s/\x0d{0,1}\x0a\Z//s; $NodeData =~ s/\x0d{0,1}\x0a\Z//s;
$NodeData =~ s/;+$//;
#$NodeData =~ s/\r\n\z//; #$NodeData =~ s/\r\n\z//;

1
UnitCsvReceiverSmart.pl
View File

@@ -31,6 +31,7 @@ sub getUnitName { # parm => file received ($trfile)
or warn getTimeStamp("log") . " >> Error: opening input file $filename\n"; or warn getTimeStamp("log") . " >> Error: opening input file $filename\n";
my ( $fileDate, $fileTime ) = split( /\s/, <FILE> ); my ( $fileDate, $fileTime ) = split( /\s/, <FILE> );
my ( $unittype, $unit ) = split( /\s/, uc <FILE> ); my ( $unittype, $unit ) = split( /\s/, uc <FILE> );
$unit =~ s/;+$//;
close FILE; close FILE;
return $unit; return $unit;
} }