Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: Type of arg 1 to keys must be hash or array (not hash element) at...

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@5805 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tpoitzsch 2014-05-10 07:59:06 +00:00
parent a303627edd
commit dbb8e7257e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
FHEM/98_statistics.pm
View File

@ -44,7 +44,7 @@ sub statistics_doStatisticMinMaxSingle ($$$$$$);
sub statistics_doStatisticDelta ($$$$$); sub statistics_doStatisticDelta ($$$$$);
# Modul Version for remote debugging # Modul Version for remote debugging
my $modulVersion = "2014-05-04"; my $modulVersion = "2014-05-10";
############################################################## ##############################################################
# Syntax: deviceType, readingName, statisticType, decimalPlaces # Syntax: deviceType, readingName, statisticType, decimalPlaces
@ -133,12 +133,12 @@ statistics_Notify($$)
my $devName = $dev->{NAME}; my $devName = $dev->{NAME};
# At startup: delete old Readings of monitored devices and rebuild from hidden readings # At startup: delete old Readings of monitored devices and rebuild from hidden readings
if ($devName eq "global" && grep (m/^INITIALIZED|REREADCFG$/,@{$dev->{CHANGED}}) && exists ($hash->{READINGS})) { if ($devName eq "global" && grep (m/^INITIALIZED|REREADCFG$/,@{$dev->{CHANGED}})) {
my %unknownDevices; my %unknownDevices;
foreach my $r (keys ($hash->{READINGS})) { foreach my $r (keys %{$hash->{READINGS}}) {
if ($r =~ /^\.(.*):.*/) { $unknownDevices{$1}++; } if ($r =~ /^\.(.*):.*/) { $unknownDevices{$1}++; }
} }
foreach my $r (keys $hash->{READINGS}) { foreach my $r (keys %{$hash->{READINGS}}) {
if ($r =~ /^monitoredDevices.*/) { if ($r =~ /^monitoredDevices.*/) {
Log3 $name,5,"$name: Initialization - Delete old reading '$r'."; Log3 $name,5,"$name: Initialization - Delete old reading '$r'.";
delete($hash->{READINGS}{$r}); delete($hash->{READINGS}{$r});
@ -225,7 +225,7 @@ statistics_PeriodChange($)
elsif ($monthNow != $monthLast) { $periodSwitch = 3; } elsif ($monthNow != $monthLast) { $periodSwitch = 3; }
elsif ($dayNow != $dayLast) { $periodSwitch = 2; } elsif ($dayNow != $dayLast) { $periodSwitch = 2; }
foreach my $r (keys $hash->{READINGS}) foreach my $r (keys %{$hash->{READINGS}})
{ {
if ($r =~ /^monitoredDevices.*/) { if ($r =~ /^monitoredDevices.*/) {
if ($r !~/UnknownTypes|Unsupported/) { if ($r !~/UnknownTypes|Unsupported/) {
@ -299,7 +299,7 @@ statistics_DoStatistics($$$)
my $monReadingName; my $monReadingName;
if ($statisticDone ==1) { if ($statisticDone ==1) {
$monReadingName = "monitoredDevices".$devType; $monReadingName = "monitoredDevices".$devType;
readingsBulkUpdate($hash,"state","Last calculated device: $devName",1); readingsBulkUpdate($hash,"state","Updated stats for: $devName",1);
} else { } else {
$monReadingName = "monitoredDevicesUnsupported"; $devName .= "($devType)", $monReadingName = "monitoredDevicesUnsupported"; $devName .= "($devType)",
} }