From 73d99c492d288fc72398667a70b8657173e4c33d Mon Sep 17 00:00:00 2001 From: betateilchen Date: Thu, 27 Jul 2017 17:26:22 +0000 Subject: [PATCH] statistics2.cgi: do not count definitions for configDB git-svn-id: https://svn.fhem.de/fhem/trunk@14802 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/statistics/2017/statistics2.cgi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fhem/contrib/statistics/2017/statistics2.cgi b/fhem/contrib/statistics/2017/statistics2.cgi index 50282e913..64d1915f1 100755 --- a/fhem/contrib/statistics/2017/statistics2.cgi +++ b/fhem/contrib/statistics/2017/statistics2.cgi @@ -222,10 +222,6 @@ sub doAggregate() { foreach my $type (sort @keys) { next if $type eq 'system'; - if(lc($type) eq 'configdb') { - $countAll{'modules'}{$type}{'definitions'} = 0; - next; - } $countAll{'modules'}{$type}{'definitions'} += $decoded->{$type}{'noModel'} ? $decoded->{$type}{'noModel'} : 0; $countAll{'modules'}{$type}{'installations'} += 1; while ( my ($model, $count) = each( %{$decoded->{$type}}) ) { @@ -233,8 +229,12 @@ sub doAggregate() { $countAll{'modules'}{$type}{'definitions'} += $count; next if(ref($model) eq "HASH"); next if($model eq "migratedData"); - $countAll{'models'}{$type}{$model}{'definitions'} += $count; $countAll{'models'}{$type}{$model}{'installations'} += 1; + $countAll{'models'}{$type}{$model}{'definitions'} += $count; + if (lc($type) eq 'configdb') { + $countAll{'modules'}{$type}{'definitions'} = 0; + $countAll{'models'}{$type}{$model}{'definitions'} = 0; + } } } }