diff --git a/fhem/CHANGED b/fhem/CHANGED index 2bc1831de..c74d5fa1e 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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. + - bugfix: 70_Pushsafer: fix availableMessages reading - bugfix: 73_AutoShuttersControl: fix GetAntiFreez - change: 59_Weather: add wunderground documentation in commandref - feature mqtt2.template: add speech recognition extensions diff --git a/fhem/FHEM/70_Pushsafer.pm b/fhem/FHEM/70_Pushsafer.pm index a0ecb391a..0d49ff307 100755 --- a/fhem/FHEM/70_Pushsafer.pm +++ b/fhem/FHEM/70_Pushsafer.pm @@ -364,21 +364,9 @@ sub Pushsafer_Callback($$$) readingsBulkUpdate($hash, "lastSuccess", $1); } - if($data =~ /available"?\s*:\s*{(.+)\s*}\s*}\s*$/gcs) + if($data =~ /available"?\s*:\s*(\d+)/gcs) { - my %devices = grep { defined($_) } map { /^"?(\d+)"?:({.+})$/ ? ($1 => $2) : undef } split(",", $1); - - foreach my $dev (keys %devices) - { - if(defined($devices{$dev}) and $devices{$dev} =~ /^{\s*"?([^":]+)"?\s*:\s*"?([^":]+)"?\s*}$/) - { - my ($devname, $available) = ($1, $2); - - $devname =~ s/\s+//g; - - readingsBulkUpdate($hash, "availableMessages-$dev-$devname", $available); - } - } + readingsBulkUpdate($hash, "availableMessages", $1); } readingsEndUpdate($hash, 1);