mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Stats: many bug fixes found while running over a very large dataset...

Browse Source
This commit is contained in:
mjollnir_ 2005-10-11 01:20:37 +00:00
parent aef46c081f
commit 5ed4dd5a76
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
course/stats.php
View File

@ -95,8 +95,9 @@
$sql = 'SELECT DISTINCT s.userid,s.roleid,u.firstname,u.lastname,u.idnumber,u.nickname FROM '.$CFG->prefix.'stats_user_'.$param->table.' s JOIN '.$CFG->prefix.'user u ON u.id = s.userid '
.'WHERE courseid = '.$course->id.' AND timeend > '.$param->timeafter . ((!empty($param->stattype)) ? ' AND stattype = \''.$param->stattype.'\'' : '');
if (!isadmin()) {
$sql .= ' AND s.roleid = 1 OR s.userid = '.$USER->id;
$sql .= ' AND (s.roleid = 1 OR s.userid = '.$USER->id .")";
}
$sql .= " ORDER BY s.roleid ";
} else {
$sql = 'SELECT s.userid,u.firstname,u.lastname,u.idnumber,u.nickname,1 AS roleid FROM '.$CFG->prefix.'user_students s JOIN '.$CFG->prefix.'user u ON u.id = s.userid WHERE course = '.$course->id;
}

16
lib/statslib.php
View File

@ -160,10 +160,10 @@ function stats_cron_daily () {
stats_get_course_users($course,$timesql,$students,$teachers);
foreach ($students as $user) {
stats_do_daily_user_cron($course,$user,1,$timesql,$nextmidnight,'daily',$daily_modules);
stats_do_daily_user_cron($course,$user,1,$timesql,$nextmidnight,$daily_modules);
}
foreach ($teachers as $user) {
stats_do_daily_user_cron($course,$user,2,$timesql,$nextmidnight,'daily',$daily_modules);
stats_do_daily_user_cron($course,$user,2,$timesql,$nextmidnight,$daily_modules);
}
}
$timestart = $nextmidnight;
@ -255,7 +255,7 @@ function stats_cron_weekly () {
foreach (array_keys((array)$stat) as $key) {
if (!isset($stat->$key)) {
$stat->key = 0; // we don't want nulls , so avoid them.
$stat->$key = 0; // we don't want nulls , so avoid them.
}
}
@ -345,6 +345,8 @@ function stats_cron_monthly () {
$sql = 'SELECT ceil(avg(students)) as students, ceil(avg(teachers)) as teachers, ceil(avg(activestudents)) as activestudents,ceil(avg(activeteachers)) as activeteachers,
sum(studentreads) as studentreads, sum(studentwrites) as studentwrites, sum(teacherreads) as teacherreads, sum(teacherwrites) as teacherwrites,
sum(logins) as logins FROM '.$CFG->prefix.'stats_daily WHERE courseid = '.$course->id.' AND '.$timesql;
$stat = get_record_sql($sql);
$stat->uniquelogins = 0;
if ($course->id == SITEID) {
@ -357,7 +359,7 @@ function stats_cron_monthly () {
foreach (array_keys((array)$stat) as $key) {
if (!isset($stat->$key)) {
$stat->key = 0; // we don't want nulls , so avoid them.
$stat->$key = 0; // we don't want nulls , so avoid them.
}
}
@ -635,7 +637,7 @@ function stats_do_aggregate_user_cron($course,$user,$roleid,$timesql,$timeend,$t
$stat->timeend = $timeend;
$sql = 'SELECT sum(reads) as reads, sum(writes) as writes FROM '.$CFG->prefix.'stats_user_daily WHERE courseid = '.$course->id.' AND '.$timesql
." AND roleid=2 AND userid = ".$stat->userid." AND stattype='activity'"; // add on roleid in case they have teacher and student records.
." AND roleid=".$roleid." AND userid = ".$stat->userid." AND stattype='activity'"; // add on roleid in case they have teacher and student records.
$r = get_record_sql($sql);
$stat->reads = (empty($r->reads)) ? 0 : $r->reads;
@ -645,7 +647,7 @@ function stats_do_aggregate_user_cron($course,$user,$roleid,$timesql,$timeend,$t
if ($course->id == SITEID) {
$sql = 'SELECT sum(reads) as reads, sum(writes) as writes FROM '.$CFG->prefix.'stats_user_daily WHERE courseid = '.$course->id.' AND '.$timesql
." AND roleid=2 AND userid = ".$stat->userid." AND stattype='logins'"; // add on roleid in case they have teacher and student records.
." AND roleid=".$roleid." AND userid = ".$stat->userid." AND stattype='logins'"; // add on roleid in case they have teacher and student records.
$r = get_record_sql($sql);
$stat->reads = (empty($r->reads)) ? 0 : $r->reads;
@ -751,7 +753,7 @@ function stats_fix_zeros($stats,$timeafter,$timestr,$line2=true,$line3=false) {
$timestr = str_replace('user_','',$timestr); // just in case.
$fun = 'stats_get_base_'.$timestr;
$now = $fun();
$times = array();