FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

60_allergy: removed deprecated extended API

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24612 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
moises 2021-06-11 15:47:38 +00:00
parent 2681c82ff3
commit 8cd65a1f68
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- change: 60_allergy: removed deprecated extended API
- feature OpenWeatherMapAPI: add wind_gust - feature OpenWeatherMapAPI: add wind_gust
- bugfix: 50_HP1000: change time format for Internal SYSTEMTIME_UTC - bugfix: 50_HP1000: change time format for Internal SYSTEMTIME_UTC
- bugfix: 73_AutoShuttersControl: add multiple Condition - bugfix: 73_AutoShuttersControl: add multiple Condition

33
fhem/FHEM/60_allergy.pm
View File

@ -1,4 +1,4 @@
############################################## ##############################################
# $Id$$$ # $Id$$$
# #
# 60_allergy.pm # 60_allergy.pm
@ -23,8 +23,6 @@ use warnings;
use Time::Local; use Time::Local;
use Encode; use Encode;
use XML::Simple;
use utf8; use utf8;
@ -80,7 +78,7 @@ sub allergy_Initialize($) {
"updateEmpty:1,0 ". "updateEmpty:1,0 ".
"levelsFormat ". "levelsFormat ".
"weekdaysFormat ". "weekdaysFormat ".
"extended5Day:1,0 ". #"extended5Day:1,0 ".
$readingFnAttributes; $readingFnAttributes;
} }
@ -107,7 +105,9 @@ sub allergy_Define($$$) {
if($req) if($req)
{ {
InternalTimer( gettimeofday() + 60, "allergy_GetUpdate", $hash, 0); use XML::Simple;
use JSON;
InternalTimer( gettimeofday() + 60, "allergy_GetUpdate", $hash);
if (!defined($attr{$name}{stateFormat})) if (!defined($attr{$name}{stateFormat}))
{ {
$attr{$name}{stateFormat} = 'fc1_maximum'; $attr{$name}{stateFormat} = 'fc1_maximum';
@ -162,18 +162,15 @@ sub allergy_GetUpdate($) {
my ($hash) = @_; my ($hash) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
if(AttrVal($name, "disable", 0) eq 1) { if(IsDisabled($name)) {
$hash->{STATE} = "disabled"; $hash->{STATE} = "disabled";
Log3 ($name, 2, "allergy $name is disabled, data update cancelled."); Log3 ($name, 2, "allergy $name is disabled, data update cancelled.");
return undef; return undef;
} }
my $url="http://www.allergie.hexal.de/pollenflug/xml-interface-neu/pollen_de_7tage.php?plz=".$hash->{helper}{ZIPCODE}; my $url="http://www.allergie.hexal.de/pollenflug/xml-interface-neu/pollen_de_7tage.php?plz=".$hash->{helper}{ZIPCODE};
if(AttrVal($name, "extended5Day", 0) eq 1) { if(AttrVal($name, "extended5Day", "0") eq "DEPRECATED") {
$url="https://pollenwarner-live.herokuapp.com/pollen/".$hash->{helper}{ZIPCODE}; $url="https://pollenwarner-live.herokuapp.com/pollen/".$hash->{helper}{ZIPCODE};
Log3 ($name, 4, "Getting URL $url"); Log3 ($name, 4, "Getting URL $url");
HttpUtils_NonblockingGet({ HttpUtils_NonblockingGet({
@ -214,7 +211,7 @@ sub allergy_Parse($$$)
{ {
Log3 $name, 1, "$name: URL error (".($hash->{ERROR}+1)."): ".$err; Log3 $name, 1, "$name: URL error (".($hash->{ERROR}+1)."): ".$err;
my $nextupdate = gettimeofday()+( (900*$hash->{ERROR}) + 90 ); my $nextupdate = gettimeofday()+( (900*$hash->{ERROR}) + 90 );
InternalTimer($nextupdate, "allergy_GetUpdate", $hash, 1); InternalTimer($nextupdate, "allergy_GetUpdate", $hash);
$hash->{STATE} = "error" if($hash->{ERROR} > 1); $hash->{STATE} = "error" if($hash->{ERROR} > 1);
$hash->{ERROR} = $hash->{ERROR}+1; $hash->{ERROR} = $hash->{ERROR}+1;
return undef; return undef;
@ -230,7 +227,7 @@ sub allergy_Parse($$$)
{ {
Log3 $name, 2, "$name: XML error ".$@; Log3 $name, 2, "$name: XML error ".$@;
my $nextupdate = gettimeofday()+$hash->{helper}{INTERVAL}; my $nextupdate = gettimeofday()+$hash->{helper}{INTERVAL};
InternalTimer($nextupdate, "allergy_GetUpdate", $hash, 1); InternalTimer($nextupdate, "allergy_GetUpdate", $hash);
return undef; return undef;
} }
@ -290,7 +287,7 @@ sub allergy_Parse($$$)
$hash->{UPDATED} = FmtDateTime(time()); $hash->{UPDATED} = FmtDateTime(time());
my $nextupdate = gettimeofday()+$hash->{helper}{INTERVAL}; my $nextupdate = gettimeofday()+$hash->{helper}{INTERVAL};
InternalTimer($nextupdate, "allergy_GetUpdate", $hash, 1); InternalTimer($nextupdate, "allergy_GetUpdate", $hash);
return undef; return undef;
} }
@ -305,7 +302,7 @@ sub allergy_ParseExtended($$$)
{ {
Log3 $name, 1, "$name: URL error (".($hash->{ERROR}+1)."): ".$err; Log3 $name, 1, "$name: URL error (".($hash->{ERROR}+1)."): ".$err;
my $nextupdate = gettimeofday()+( (900*$hash->{ERROR}) + 90 ); my $nextupdate = gettimeofday()+( (900*$hash->{ERROR}) + 90 );
InternalTimer($nextupdate, "allergy_GetUpdate", $hash, 1); InternalTimer($nextupdate, "allergy_GetUpdate", $hash);
$hash->{STATE} = "error" if($hash->{ERROR} > 1); $hash->{STATE} = "error" if($hash->{ERROR} > 1);
$hash->{ERROR} = $hash->{ERROR}+1; $hash->{ERROR} = $hash->{ERROR}+1;
return undef; return undef;
@ -319,7 +316,7 @@ sub allergy_ParseExtended($$$)
{ {
Log3 $name, 2, "$name: JSON error ".$@; Log3 $name, 2, "$name: JSON error ".$@;
my $nextupdate = gettimeofday()+$hash->{helper}{INTERVAL}; my $nextupdate = gettimeofday()+$hash->{helper}{INTERVAL};
InternalTimer($nextupdate, "allergy_GetUpdate", $hash, 1); InternalTimer($nextupdate, "allergy_GetUpdate", $hash);
return undef; return undef;
} }
@ -392,7 +389,7 @@ sub allergy_ParseExtended($$$)
$hash->{UPDATED} = FmtDateTime(time()); $hash->{UPDATED} = FmtDateTime(time());
my $nextupdate = gettimeofday()+$hash->{helper}{INTERVAL}; my $nextupdate = gettimeofday()+$hash->{helper}{INTERVAL};
InternalTimer($nextupdate, "allergy_GetUpdate", $hash, 1); InternalTimer($nextupdate, "allergy_GetUpdate", $hash);
return undef; return undef;
} }
@ -630,10 +627,6 @@ sub allergy_utf8clean($) {
<br> <br>
Aktualisierung von Allergenen, die sonst durch die ignoreList entfernt werden. Aktualisierung von Allergenen, die sonst durch die ignoreList entfernt werden.
</li><br> </li><br>
<li><code>extended5Days (1)</code>
<br>
Alternative Datenquelle mit 5 Tagen Vorhersage für mehr Allergene
</li><br>
<li><code>levelsFormat (Standard: -,low,moderate,high,extreme)</code> <li><code>levelsFormat (Standard: -,low,moderate,high,extreme)</code>
<br> <br>
Lokalisierte Levels, durch Kommas getrennt. Lokalisierte Levels, durch Kommas getrennt.