diff --git a/AlertNotReceived.pl b/AlertNotReceived.pl index 84308d1..1da149e 100644 --- a/AlertNotReceived.pl +++ b/AlertNotReceived.pl @@ -16,7 +16,8 @@ my ($email_msg, $email_obj, $tools_info, $ref_date); my $act_tool = 0; my $gd_tool = 0; #my $email_addr = 'alessandro.battilani@gmail.com'; -my $email_addr = 'aseparma@gmail.com,alessandro.battilani@gmail.com,corrado@geielettronica.it,luca.chiapponi@unipr.it'; +my $email_addr = 'andrea.segalini@aseltd.eu,andrea.carri@aseltd.eu,roberto.savi@aseltd.eu,edoardo.cavalca@aseltd.eu,alessandro.valletta@aseltd.eu,alessandro.battilani@gmail.com,corrado@geielettronica.it,luca.chiapponi@aseltd.eu'; +my $cc_email_addr = $email_addr; sub getLoggingTime { my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst)=localtime(time); @@ -87,6 +88,7 @@ sub emailSend { port => 587, from => 'ASE Alert System', to => $email_addr, + cc => $cc_email_addr, subject => $email_obj, msg => $email_msg, ctype => "text/html", @@ -110,7 +112,7 @@ print getLoggingTime() . " - pid $$ >> Start execution.\n"; my $dbh = DBI->connect("DBI:mysql:$db_lar;host=$server", $username, $password) or die getLoggingTime() . " - Could not connect to database: $DBI::errstr"; -my $sth = $dbh->prepare('select idCompany, CompanyNameShort, SiteName, CompanyEmail, UnitNameId, ToolNameID, ToolState from mail_view;') +my $sth = $dbh->prepare('select idCompany, CompanyNameShort, SiteName, CompanyEmail, SendAlarm, UnitNameId, ToolNameID, ToolState from mail_view;') or die getLoggingTime() . " - $DBI::errstr"; $sth->execute(); @@ -123,6 +125,7 @@ if ($sth->rows < 0) { $ToolName{$results->{'ToolNameID'}}{'CompanyNameShort'} = $results->{'CompanyNameShort'}; $ToolName{$results->{'ToolNameID'}}{'SiteName'} = $results->{'SiteName'}; $ToolName{$results->{'idCompany'}}{'CompanyEmail'} = $results->{'CompanyEmail'}; + $ToolName{$results->{'idCompany'}}{'SendAlarm'} = $results->{'SendAlarm'}; $ToolName{$results->{'ToolNameID'}}{'UnitNameId'} = $results->{'UnitNameId'}; $ToolName{$results->{'ToolNameID'}}{'ToolState'} = $results->{'ToolState'}; $ToolName{$results->{'ToolNameID'}}{'LettureNodi'} = "--"; @@ -210,7 +213,12 @@ emailSend(); foreach my $comp (keys %Tools_infoCompany) { $tools_info = $Tools_infoCompany{$comp}; - #$email_addr = $ToolName{$comp}{'CompanyEmail'}; + my $comp_email = $ToolName{$comp}{'CompanyEmail'}; + my $send_alarm = $ToolName{$comp}{'SendAlarm'}; + print getLoggingTime() . " - Company email: $comp_email - Send Alarm: $send_alarm\n"; + if ($send_alarm == 1) { + $email_addr = $ToolName{$comp}{'CompanyEmail'}; + } makeEmailMsg(); emailSend(); } diff --git a/LoadCSVData.pl b/LoadCSVData.pl index eeae062..c19c710 100644 --- a/LoadCSVData.pl +++ b/LoadCSVData.pl @@ -483,7 +483,7 @@ while ( my $line = ) { join( ';', splice( @NewData, 0, $ch ) ); } - print Dumper \@CSVData; + #print Dumper \@CSVData; #print Dumper \@channels; #print Dumper \@din;