mesa e recupero g301

UnitCsvReceiverSmart.pl

@@ -54,13 +54,19 @@ 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];
         $unit     = $strings[1];
     }
     elsif ( $filenamecsv =~ m/^(\d*_|)G301_ID\d\d\d\d_DT\d\d\d\d$/i ) {
-        my @strings = $filenamecsv =~ /(.{1,4})_(.{1,6})_(.{1,6}).*/;
+        my $filecsvname_clean =
+          substr( $filenamecsv, index( $filenamecsv, "G301" ) );
+        my @strings = $filecsvname_clean =~ /(.{1,4})_(.{1,6})_(.{1,6}).*/;
         $unittype = $strings[0];
         $unit     = $strings[1];
     }
@@ -109,8 +115,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 =~
+                or $filename =~ m/^measurements_\d\d_\d\d_\d\d\d\d__\d\d_\d\d$/i
-                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 +159,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' )