From 0020087b32e8cbbd6bbc487b3da2d37820cdf3b8 Mon Sep 17 00:00:00 2001 From: battilo Date: Sun, 1 Oct 2017 11:03:59 +0200 Subject: [PATCH] tolti ; dai file editati --- LoadCSVData.pl | 3 +++ UnitCsvReceiverSmart.pl | 1 + 2 files changed, 4 insertions(+) diff --git a/LoadCSVData.pl b/LoadCSVData.pl index 36e5da2..33e4d5a 100644 --- a/LoadCSVData.pl +++ b/LoadCSVData.pl @@ -344,10 +344,12 @@ else { my ( $fileDate, $fileTime ) = split( /\s/, ); my ( $unittype, $unit ) = split( /\s/, uc ); +$unit =~ s/;+$//; while ( my $line = ) { my ( $first, $NodeData ) = split( /;/, $line, 2 ); if ( defined $first and ( $first ne '' ) ) { + $first =~ s/;+$//; if ( !defined $NodeData or ( $NodeData =~ m/^;+/ ) ) { my @info = ( split( /[\/,\.]/, $first ) ); if ( defined $info[3] && $info[3] =~ m/^DT\d\d\d\d$/i ) { @@ -373,6 +375,7 @@ while ( my $line = ) { } else { $NodeData =~ s/\x0d{0,1}\x0a\Z//s; + $NodeData =~ s/;+$//; #$NodeData =~ s/\r\n\z//; diff --git a/UnitCsvReceiverSmart.pl b/UnitCsvReceiverSmart.pl index a091cb9..a8e7ec6 100644 --- a/UnitCsvReceiverSmart.pl +++ b/UnitCsvReceiverSmart.pl @@ -31,6 +31,7 @@ sub getUnitName { # parm => file received ($trfile) or warn getTimeStamp("log") . " >> Error: opening input file $filename\n"; my ( $fileDate, $fileTime ) = split( /\s/, ); my ( $unittype, $unit ) = split( /\s/, uc ); + $unit =~ s/;+$//; close FILE; return $unit; }