From 6d77fc7031d6ed7689821af8c3ffeface971e11a Mon Sep 17 00:00:00 2001 From: Alessandro Battilani Date: Tue, 23 Nov 2021 19:14:13 +0100 Subject: [PATCH] nesa con codice seriale nel nome --- UnitCsvReceiverSmart.pl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/UnitCsvReceiverSmart.pl b/UnitCsvReceiverSmart.pl index ea81111..7a211b6 100644 --- a/UnitCsvReceiverSmart.pl +++ b/UnitCsvReceiverSmart.pl @@ -54,6 +54,10 @@ sub getUnitName { # parm => file received ($trfile) elsif ( $filenamecsv =~ m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i ) { $unittype = "NESA"; } + elsif ( $filenamecsv =~ m/^\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d$/i ) + { # nesa file con serial number centralina + $unittype = "NESA"; + } elsif ( $filenamecsv =~ m/^D2W_ID\d\d\d\d_DT\d\d\d\d$/i ) { my @strings = $filenamecsv =~ /(.{1,3})_(.{1,6})_(.{1,6}).*/; $unittype = $strings[0]; @@ -109,8 +113,8 @@ while ( my $line = $tail->GetLine() ) { or $filename =~ m/^D2W_ID\d\d\d\d_DT\d\d\d\d$/i or $filename =~ m/^(\d*_|)G301_ID\d\d\d\d_DT\d\d\d\d$/i or $filename =~ m/^GFLOW_ID\d\d\d\d_DT\d\d\d\d_\d*$/i - or $filename =~ - m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i ) + or $filename =~ m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i + or $filename =~ m/^\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d$/i ) ) { @@ -153,6 +157,8 @@ while ( my $line = $tail->GetLine() ) { or $filename =~ m/^GFLOW_ID\d\d\d\d_DT\d\d\d\d_\d*$/i or $filename =~ m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i + or $filename =~ + m/^\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d$/i ) and ( $unit ne 'ID9999' ) and ( $truser ne 'corra' )