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

statistics2.cgi: improve age calculation

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14742 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2017-07-18 14:14:47 +00:00
parent 25add24ed0
commit 889f9c648e
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/contrib/statistics/2017/statistics2.cgi
View File

@ -167,12 +167,7 @@ sub doAggregate() {
my $nodesTotal = $dbInfo->{'submissionsTotal'}; my $nodesTotal = $dbInfo->{'submissionsTotal'};
my $nodes12 = 0; my $nodes12 = 0;
$countAll{'system'}{'age'}{'0'} = 0; map { $countAll{system}{age}{$_} = 0; } (0,7,30,180,365,999);
$countAll{'system'}{'age'}{'7'} = $countAll{'system'}{'age'}{'0'};
$countAll{'system'}{'age'}{'30'} = $countAll{'system'}{'age'}{'0'};
$countAll{'system'}{'age'}{'180'} = $countAll{'system'}{'age'}{'0'};
$countAll{'system'}{'age'}{'365'} = $countAll{'system'}{'age'}{'0'};
$countAll{'system'}{'age'}{'999'} = $countAll{'system'}{'age'}{'0'};
$sql = "SELECT geo,json FROM jsonNodes WHERE uniqueID <> 'databaseInfo' "; $sql = "SELECT geo,json FROM jsonNodes WHERE uniqueID <> 'databaseInfo' ";
$sql .= "AND geo <> '' AND json <> '' and lastseen > $limit"; $sql .= "AND geo <> '' AND json <> '' and lastseen > $limit";
@ -229,10 +224,10 @@ sub doAggregate() {
$countAll{'modules'}{$type}{'installations'} += 1; $countAll{'modules'}{$type}{'installations'} += 1;
while ( my ($model, $count) = each( %{$decoded->{$type}}) ) { while ( my ($model, $count) = each( %{$decoded->{$type}}) ) {
next if($model eq "noModel"); next if($model eq "noModel");
$countAll{'modules'}{$type}{'definitions'} += $count; $countAll{'modules'}{$type}{'definitions'} += $count;
next if($model eq "migratedData"); next if($model eq "migratedData");
$countAll{'models'}{$type}{$model}{'definitions'} += $count; $countAll{'models'}{$type}{$model}{'definitions'} += $count;
$countAll{'models'}{$type}{$model}{'installations'}+= 1; $countAll{'models'}{$type}{$model}{'installations'} += 1;
} }
} }
} }