FHEM/mod-UWZ
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

code style and version number changed

Browse Source
This commit is contained in:
Marko Oldenburg 2020-04-28 14:42:56 +02:00
parent 2529758f86
commit e8f92c5f0b
1 changed files with 230 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
77_UWZ.pm
View File

@ -999,7 +999,8 @@ sub Done {
if ( defined $values{Error} ) { if ( defined $values{Error} ) {
readingsBulkUpdate( $hash, 'lastConnection', $values{Error} ); readingsBulkUpdate( $hash, 'lastConnection', $values{Error} );
readingsBulkUpdate( $hash, 'state', 'error at last run, please check >>lastConnection<< reading' ); readingsBulkUpdate( $hash, 'state',
'error at last run, please check >>lastConnection<< reading' );
} }
else { else {
@ -1154,21 +1155,6 @@ sub Run {
my $uwz_warnings = JSON->new->ascii->decode($response); my $uwz_warnings = JSON->new->ascii->decode($response);
my $message; my $message;
my $uwz_warncount; my $uwz_warncount;
@ -1184,7 +1170,8 @@ sub Run {
if ( $sortby eq 'creation' ) { if ( $sortby eq 'creation' ) {
Log $hash, 4, 'Sorting by creation'; Log $hash, 4, 'Sorting by creation';
@sorted = sort { $b->{payload}{creation} <=> $a->{payload}{creation} } @sorted =
sort { $b->{payload}{creation} <=> $a->{payload}{creation} }
@{ $uwz_warnings->{'results'} }; @{ $uwz_warnings->{'results'} };
} }
@ -1200,7 +1187,6 @@ sub Run {
@{ $uwz_warnings->{'results'} }; @{ $uwz_warnings->{'results'} };
} }
my $i = 0; my $i = 0;
my %typenames = ( my %typenames = (
@ -1298,7 +1284,10 @@ sub Run {
Log $hash, 4, Log $hash, 4,
'Warn_' . $i . '_EventID: ' . $single_warning->{'payload'}{'id'}; 'Warn_' . $i . '_EventID: ' . $single_warning->{'payload'}{'id'};
$message .= $message .=
'Warn_' . $i . '_EventID|' . $single_warning->{'payload'}{'id'} . '|'; 'Warn_'
. $i
. '_EventID|'
. $single_warning->{'payload'}{'id'} . '|';
my $chopcreation = my $chopcreation =
substr( $single_warning->{'payload'}{'creation'}, 0, 10 ); substr( $single_warning->{'payload'}{'creation'}, 0, 10 );
@ -1308,7 +1297,8 @@ sub Run {
$message .= 'Warn_' . $i . '_Creation|' . $chopcreation . '|'; $message .= 'Warn_' . $i . '_Creation|' . $chopcreation . '|';
Log $hash, 4, 'Warn_' . $i . '_Type: ' . $single_warning->{'type'}; Log $hash, 4, 'Warn_' . $i . '_Type: ' . $single_warning->{'type'};
$message .= 'Warn_' . $i . '_Type|' . $single_warning->{'type'} . '|'; $message .=
'Warn_' . $i . '_Type|' . $single_warning->{'type'} . '|';
Log $hash, 4, Log $hash, 4,
'Warn_' 'Warn_'
@ -1326,12 +1316,14 @@ sub Run {
$message .= $message .=
'Warn_' . $i . '_Severity|' . $single_warning->{'severity'} . '|'; 'Warn_' . $i . '_Severity|' . $single_warning->{'severity'} . '|';
Log $hash, 4, 'Warn_' . $i . '_Start: ' . $single_warning->{'dtgStart'}; Log $hash, 4,
'Warn_' . $i . '_Start: ' . $single_warning->{'dtgStart'};
$message .= $message .=
'Warn_' . $i . '_Start|' . $single_warning->{'dtgStart'} . '|'; 'Warn_' . $i . '_Start|' . $single_warning->{'dtgStart'} . '|';
Log $hash, 4, 'Warn_' . $i . '_End: ' . $single_warning->{'dtgEnd'}; Log $hash, 4, 'Warn_' . $i . '_End: ' . $single_warning->{'dtgEnd'};
$message .= 'Warn_' . $i . '_End|' . $single_warning->{'dtgEnd'} . '|'; $message .=
'Warn_' . $i . '_End|' . $single_warning->{'dtgEnd'} . '|';
## Begin of redundant Reading ## Begin of redundant Reading
if ( $UWZ_humanreadable eq 1 ) { if ( $UWZ_humanreadable eq 1 ) {
@ -1352,11 +1344,13 @@ sub Run {
'Warn_' 'Warn_'
. $i . $i
. '_Start_Time: ' . '_Start_Time: '
. strftime( "%H:%M", localtime( $single_warning->{'dtgStart'} ) ); . strftime( "%H:%M",
localtime( $single_warning->{'dtgStart'} ) );
$message .= 'Warn_' $message .= 'Warn_'
. $i . $i
. '_Start_Time|' . '_Start_Time|'
. strftime( "%H:%M", localtime( $single_warning->{'dtgStart'} ) ) . strftime( "%H:%M",
localtime( $single_warning->{'dtgStart'} ) )
. '|'; . '|';
Log $hash, 4, Log $hash, 4,
@ -1368,18 +1362,21 @@ sub Run {
$message .= 'Warn_' $message .= 'Warn_'
. $i . $i
. '_End_Date|' . '_End_Date|'
. strftime( "%d.%m.%Y", localtime( $single_warning->{'dtgEnd'} ) ) . strftime( "%d.%m.%Y",
localtime( $single_warning->{'dtgEnd'} ) )
. '|'; . '|';
Log $hash, 4, Log $hash, 4,
'Warn_' 'Warn_'
. $i . $i
. '_End_Time: ' . '_End_Time: '
. strftime( "%H:%M", localtime( $single_warning->{'dtgEnd'} ) ); . strftime( "%H:%M",
localtime( $single_warning->{'dtgEnd'} ) );
$message .= 'Warn_' $message .= 'Warn_'
. $i . $i
. '_End_Time|' . '_End_Time|'
. strftime( "%H:%M", localtime( $single_warning->{'dtgEnd'} ) ) . strftime( "%H:%M",
localtime( $single_warning->{'dtgEnd'} ) )
. '|'; . '|';
Log $hash, 4, Log $hash, 4,
@ -1623,7 +1620,8 @@ sub Run {
'UTF-8', 'UTF-8',
decode( decode(
'iso-8859-1', 'iso-8859-1',
$single_warning->{'payload'}{'translationsLongText'}{$uclang} $single_warning->{'payload'}{'translationsLongText'}
{$uclang}
) )
) . '|'; ) . '|';
@ -1632,7 +1630,8 @@ sub Run {
. $i . $i
. '_ShortText: ' . '_ShortText: '
. $enc->decode( . $enc->decode(
$single_warning->{'payload'}{'translationsShortText'}{$uclang} ); $single_warning->{'payload'}{'translationsShortText'}{$uclang}
);
$message .= 'Warn_' $message .= 'Warn_'
. $i . $i
@ -1641,7 +1640,8 @@ sub Run {
'UTF-8', 'UTF-8',
decode( decode(
'iso-8859-1', 'iso-8859-1',
$single_warning->{'payload'}{'translationsShortText'}{$uclang} $single_warning->{'payload'}{'translationsShortText'}
{$uclang}
) )
) . '|'; ) . '|';
@ -1661,7 +1661,9 @@ sub Run {
. $typenames{ $single_warning->{'type'} } . '-' . $typenames{ $single_warning->{'type'} } . '-'
. GetSeverityColor( . GetSeverityColor(
$hash, $hash,
GetUWZLevel( $hash, $single_warning->{'payload'}{'levelName'} ) GetUWZLevel(
$hash, $single_warning->{'payload'}{'levelName'}
)
) . '.png|'; ) . '.png|';
} }
@ -1678,7 +1680,9 @@ sub Run {
. $typenames{ $single_warning->{'type'} } . '-' . $typenames{ $single_warning->{'type'} } . '-'
. GetSeverityColor( . GetSeverityColor(
$hash, $hash,
GetUWZLevel( $hash, $single_warning->{'payload'}{'levelName'} ) GetUWZLevel(
$hash, $single_warning->{'payload'}{'levelName'}
)
) . '.gif|'; ) . '.gif|';
} }
### ###
@ -1742,7 +1746,8 @@ sub Run {
$message .= $max . '|'; $message .= $max . '|';
Log $hash, 4, 'WarnUWZLevel_Color: ' . GetSeverityColor( $hash, $max ); Log $hash, 4, 'WarnUWZLevel_Color: ' . GetSeverityColor( $hash, $max );
$message .= 'WarnUWZLevel_Color|' . GetSeverityColor( $hash, $max ) . '|'; $message .=
'WarnUWZLevel_Color|' . GetSeverityColor( $hash, $max ) . '|';
## Begin of redundant Reading ## Begin of redundant Reading
if ( $UWZ_humanreadable eq 1 ) { if ( $UWZ_humanreadable eq 1 ) {
@ -1806,7 +1811,8 @@ sub Run {
$message .= sprintf "%.2f", time() - $readingStartTime; $message .= sprintf "%.2f", time() - $readingStartTime;
Log $hash, 3, 'Done fetching data'; Log $hash, 3, 'Done fetching data';
Log $hash, 4, 'Will return : ' . "$name|$message|WarnCount|$uwz_warncount"; Log $hash, 4,
'Will return : ' . "$name|$message|WarnCount|$uwz_warncount";
} }
else { else {
$message = 'Error|' . $uwz_warnings->{Error}; $message = 'Error|' . $uwz_warnings->{Error};
@ -3374,7 +3380,7 @@ sub UWZSearchAreaID {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.2.5", "version": "v3.0.0",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],