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

added missing indexes in stats upgrade, fixed discrepency between stattype enrolment or enrolments

Browse Source
This commit is contained in:
mjollnir_ 2006-09-22 10:43:04 +00:00
parent 1282edc826
commit f5aa20162c
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/statslib.php
View File

@ -133,8 +133,8 @@ function stats_cron_daily () {
}
}
if (!$roles = get_roles_used_in_context($course,CONTEXT_COURSE)) {
$context = get_record('context','instanceid',$course->id,'contextlevel',CONTEXT_COURSE);
if (!$roles = get_roles_used_in_context($context)) {
// no roles.. nothing to log.
continue;
}
@ -146,7 +146,7 @@ function stats_cron_daily () {
$stat->courseid = $course->id;
$stat->roleid = $role->id;
$stat->timeend = $nextmidnight;
$stat->stattype = 'enrolment';
$stat->stattype = 'enrolments';
$sql = 'SELECT COUNT(DISTINCT ra.userid)
FROM '.$CFG->prefix.'role_assignments ra
INNER JOIN '.$CFG->prefix.'role r_outmost ON (ra.roleid=r_outmost.id)
@ -306,14 +306,14 @@ function stats_cron_weekly () {
// enrolment first
$sql = 'SELECT roleid, ceil(avg(stat1)) AS stat1, ceil(avg(stat2)) AS stat2
FROM '.$CFG->prefix.'stats_daily
WHERE courseid = '.$course->id.' AND '.$timesql.' AND stattype = \'enrolment\'
WHERE courseid = '.$course->id.' AND '.$timesql.' AND stattype = \'enrolments\'
GROUP BY roleid';
if ($rolestats = get_records_sql($sql)) {
foreach ($rolestats as $stat) {
$stat->courseid = $course->id;
$stat->timeend = $nextsunday;
$stat->stattype = 'enrolment';
$stat->stattype = 'enrolments';
insert_record('stats_weekly',$stat,false); // don't worry about the return id, we don't need it.
}
@ -432,14 +432,14 @@ function stats_cron_monthly () {
// enrolment first
$sql = 'SELECT roleid, ceil(avg(stat1)) AS stat1, ceil(avg(stat2)) AS stat2
FROM '.$CFG->prefix.'stats_daily
WHERE courseid = '.$course->id.' AND '.$timesql.' AND stattype = \'enrolment\'
WHERE courseid = '.$course->id.' AND '.$timesql.' AND stattype = \'enrolments\'
GROUP BY roleid';
if ($rolestats = get_records_sql($sql)) {
foreach ($rolestats as $stat) {
$stat->courseid = $course->id;
$stat->timeend = $nextmonthend;
$stat->stattype = 'enrolment';
$stat->stattype = 'enrolments';
insert_record('stats_monthly',$stat,false); // don't worry about the return id, we don't need it.
}
@ -1195,6 +1195,15 @@ function stats_upgrade_table_for_roles ($period) {
XMLDB_NOTNULL, null, null, null, null);
$table->addFieldInfo('stat2', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED,
XMLDB_NOTNULL, null, null, null, null);
/// Adding keys to table stats_daily
$table->addKeyInfo('primary', XMLDB_KEY_PRIMARY, array('id'));
/// Adding indexes to table stats_daily
$table->addIndexInfo('courseid', XMLDB_INDEX_NOTUNIQUE, array('courseid'));
$table->addIndexInfo('timeend', XMLDB_INDEX_NOTUNIQUE, array('timeend'));
$table->addIndexInfo('roleid', XMLDB_INDEX_NOTUNIQUE, array('roleid'));
if (!create_table($table)) {
return false;
}