un po' di roba

This commit is contained in:
2019-08-09 00:21:14 +02:00
parent 6acf32da48
commit 17bf314eca
4 changed files with 44 additions and 41 deletions

View File

@@ -30,12 +30,12 @@ sub getUnitName { # parm => file received ($trfile)
my ( $fileDate, $fileTime );
my ( $unittype, $unit );
my ( $filenamecsv, $path, $suffix ) = fileparse( $filename, qr/\.[^.]*/ );
if ( $filenamecsv =~ m/^(\d\d_\d\d\d\d_|)(\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)$/i ) { # GD201
my @strings = $filenamecsv =~ /(.{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];;
$fileTime = $strings[3] . ":" . $strings[4] . ":" . $strings[5];
$unittype = $strings[6];
$unit = $strings[7];
if ( $filenamecsv =~ m/^G201_ID\d\d\d\d_DT\d\d\d\d_\d*$/i ) { # GD201
my @strings = $filenamecsv =~ /(.{1,4})_(.{1,6})_(.{1,6})_(.{1,4})(.{1,2})(.{1,2})(.{1,2})(.{1,2})(.{1,2}).*/;
$unittype = $strings[0];
$unit = $strings[1];
$fileDate = $strings[3] . "/" . $strings[4] . "/" . $strings[5];;
$fileTime = $strings[6] . ":" . $strings[7] . ":" . $strings[8];
} else {
open FILE, $filename
or warn getTimeStamp("log") . " >> Error: opening input file $filename\n";
@@ -69,15 +69,13 @@ while ( my $line = $tail->GetLine() ) {
or warn getTimeStamp("log") . " >> $truser not in passwd file.\n";
my ( $filename, $path, $suffix ) = fileparse( $trfile, qr/\.[^.]*/ );
if ( $path eq "/" ) {
$path = "/home/" . $truser . "/";
$trfile = "/home/" . $truser . $trfile;
}
$path = "/home/" . $truser . "/";
$trfile = "/home/" . $truser . $trfile;
if ( ( ( uc $suffix ) eq ( uc $ext ) )
and
( $filename =~ m/^(\d\d_\d\d\d\d_|)(DT\d\d\d\d|LOC\d*|GD\d*)$/i
or $filename =~ m/^(\d\d_\d\d\d\d_|)(\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)$/i) )
or $filename =~ m/^G201_ID\d\d\d\d_DT\d\d\d\d_\d*$/i) )
{
my $unit = getUnitName($trfile);
print getTimeStamp("log") . " >> Unit $unit - Filename $trfile\n";
@@ -109,7 +107,7 @@ while ( my $line = $tail->GetLine() ) {
my @fname = ($dest);
chown $uid, $gid, @fname;
if ( ($filename =~ m/^(\d\d_\d\d\d\d_|)(DT\d\d\d\d|LOC\d.*|GD\d*)$/i
or $filename =~ m/^(\d\d_\d\d\d\d_|)(\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)$/i)
or $filename =~ m/^G201_ID\d\d\d\d_DT\d\d\d\d_\d*$/i)
and ( $unit ne 'ID9999' )
and ( $truser ne 'corra' ) )
{