FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-28 05:01:57 +00:00
Code Issues Releases Wiki Activity

76_SMAPortal: contrib 3.6.2

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23091 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-11-03 21:13:03 +00:00
parent 9f864dbc24
commit 0dc50648c0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/contrib/DS_Starter/76_SMAPortal.pm
View File

@ -1960,7 +1960,10 @@ sub __dispatchPost {
content => $cont, content => $cont,
}); });
$ua->cookie_jar->extract_cookies($data);
($reread,$retry,$errstate,$state) = ___analyzeData ({ name => $name, ($reread,$retry,$errstate,$state) = ___analyzeData ({ name => $name,
ua => $ua,
errstate => $errstate, errstate => $errstate,
state => $state, state => $state,
data => $data data => $data
@ -2067,6 +2070,7 @@ sub ___analyzeData { ## no critic 'complexity'
my $name = $paref->{name}; my $name = $paref->{name};
my $errstate = $paref->{errstate}; my $errstate = $paref->{errstate};
my $state = $paref->{state}; my $state = $paref->{state};
my $ua = $paref->{ua};
my $ad = $paref->{data}; my $ad = $paref->{data};
my $hash = $defs{$name}; my $hash = $defs{$name};
my ($reread,$retry) = (0,0); my ($reread,$retry) = (0,0);
@ -2075,7 +2079,7 @@ sub ___analyzeData { ## no critic 'complexity'
my $v5d = AttrVal($name, "verbose5Data", "none"); my $v5d = AttrVal($name, "verbose5Data", "none");
my $ad_content = encode("utf8", $ad->decoded_content); my $ad_content = encode("utf8", $ad->decoded_content);
my $act = $hash->{HELPER}{RETRIES}; # Index aktueller Wiederholungsversuch my $act = $hash->{HELPER}{RETRIES}; # Index aktueller Wiederholungsversuch
my $attstr = "Attempts read data again in $sleepretry s ... ($act of $maxretries)"; # Log vorbereiten my $attstr = "Attempts read data again in $sleepretry s ... ($act of $maxretries)"; # Log vorbereiten
my $wm1e = qq{Updating of the live data was interrupted}; my $wm1e = qq{Updating of the live data was interrupted};
my $wm1d = qq{Die Aktualisierung der Live-Daten wurde unterbrochen}; my $wm1d = qq{Die Aktualisierung der Live-Daten wurde unterbrochen};
@ -2089,6 +2093,7 @@ sub ___analyzeData { ## no critic 'complexity'
$data = eval{decode_json($ad_content)} or do { $data = $ad_content }; $data = eval{decode_json($ad_content)} or do { $data = $ad_content };
my $jsonerror = $ad->header('Jsonerror') // ""; # Portal meldet keine Verarbeitung des Reaquests möglich (z.B. Jahr 0000 zur Auswertung angefordert) my $jsonerror = $ad->header('Jsonerror') // ""; # Portal meldet keine Verarbeitung des Reaquests möglich (z.B. Jahr 0000 zur Auswertung angefordert)
if($jsonerror) { if($jsonerror) {
$errstate = 1; $errstate = 1;
$state = "SMA Portal failure: "."Message -> ".$data->{Message}.",\nStackTrace -> ".$data->{StackTrace}.",\nExceptionType -> ".$data->{ExceptionType}; $state = "SMA Portal failure: "."Message -> ".$data->{Message}.",\nStackTrace -> ".$data->{StackTrace}.",\nExceptionType -> ".$data->{ExceptionType};