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 argument to keys on reference must be unblessed hashref or arrayref at ./FHEM/98_statistics.pm line 138.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5799 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tpoitzsch 2014-05-09 17:10:46 +00:00
parent b9785ab6c7
commit 01f6ec091b
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fhem/FHEM/98_statistics.pm
View File

@ -133,9 +133,9 @@ 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}})) { if ($devName eq "global" && grep (m/^INITIALIZED|REREADCFG$/,@{$dev->{CHANGED}}) && exists ($hash->{READINGS})) {
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}) {
@ -254,8 +254,26 @@ statistics_DoStatistics($$$)
return "" if(AttrVal($hashName, "disable", undef)); return "" if(AttrVal($hashName, "disable", undef));
my $readingName; my $readingName;
my $exclReadings = AttrVal($hashName, "excludedReadings", ""); my $exclReadings = AttrVal($hashName, "excludedReadings", "");
my $regExp = '^'.$devName.'$|^'.$devName.',|,'.$devName.'$|,'.$devName.',';
# Return if the notifying device is already served by another statistics instance
if (exists ($dev->{helper}{_98_statistics})) {
my $servedBy = $dev->{helper}{_98_statistics};
if ($servedBy ne $hashName) {
my $monReadingValue = ReadingsVal($hashName,"monitoredDevicesUnserved","");
if ($monReadingValue !~ /regExp/) {
if($monReadingValue eq "") { $monReadingValue = $devName;}
else {$monReadingValue .= ",".$devName;}
readingsSingleUpdate($hash,"monitoredDevicesUnserved",$monReadingValue,1);
Log3 $hashName,3,"$hashName: Device '$devName' identified as supported but already servered by '$servedBy'.";
}
return;
}
} else {
$dev->{helper}{_98_statistics}=$hashName;
}
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBeginUpdate($dev); readingsBeginUpdate($dev);
@ -282,14 +300,13 @@ statistics_DoStatistics($$$)
if ($statisticDone ==1) { $monReadingName = "monitoredDevices".$devType; } if ($statisticDone ==1) { $monReadingName = "monitoredDevices".$devType; }
else {$monReadingName = "monitoredDevicesUnsupported"; $devName .= "($devType)"} else {$monReadingName = "monitoredDevicesUnsupported"; $devName .= "($devType)"}
my $monReadingValue = ReadingsVal($hashName,$monReadingName,""); my $monReadingValue = ReadingsVal($hashName,$monReadingName,"");
my $temp = '^'.$devName.'$|^'.$devName.',|,'.$devName.'$|,'.$devName.','; if ($monReadingValue !~ /regExp/) {
if ($monReadingValue !~ /$temp/) {
if($monReadingValue eq "") { $monReadingValue = $devName;} if($monReadingValue eq "") { $monReadingValue = $devName;}
else {$monReadingValue .= ",".$devName;} else {$monReadingValue .= ",".$devName;}
readingsBulkUpdate($hash,$monReadingName,$monReadingValue,1); readingsBulkUpdate($hash,$monReadingName,$monReadingValue,1);
my $monReadingValue = ReadingsVal($hashName,"monitoredDevicesUnknownType",""); my $monReadingValue = ReadingsVal($hashName,"monitoredDevicesUnknownType","");
if ($monReadingValue =~ /$temp/) { if ($monReadingValue =~ /$regExp/) {
$monReadingValue =~ s/$devName,?//; $monReadingValue =~ s/$devName,?//;
$monReadingValue =~ s/,$//; $monReadingValue =~ s/,$//;
if ($monReadingValue ne "") { if ($monReadingValue ne "") {