L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix_course_sortorder(): fix breakage with large categories, saner error

Browse Source 
Two improvements for fix_course_sortorder()

 - If the category has more courses than the shift range
   use a larger shift range to avoid overlapping with itself

 - If things do go wrong during the per-course sortorder updates,
   rollback and try and call ourselves with a 'safe' flag.

Still - far from perfect. Probably the global sortorder approach
is broken. The sanest way is to rework things to always join against
course_categories and order by the combined sortorders.
This commit is contained in:
martinlanghoff
2007-09-12 02:56:16 +00:00
parent dc6cc11a72
commit f8ea60777c
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/datalib.php
+17 -3
View File
@@ -960,6 +960,9 @@ function fix_course_sortorder($categoryid=0, $n=0, $safe=0, $depth=0, $path='')
// special, optimized case where all we need is to shift
if ( $mustshift && !$safe && !$hasgap) {
$shift = $n + $catgap - $min;
if ($shift < $count) {
$shift = $count + $catgap;
}
// UPDATE course SET sortorder=sortorder+$shift
execute_sql("UPDATE {$CFG->prefix}course
SET sortorder=sortorder+$shift
@@ -979,13 +982,24 @@ function fix_course_sortorder($categoryid=0, $n=0, $safe=0, $depth=0, $path='')
$courses = get_courses($categoryid, 'c.sortorder ASC', 'c.id,c.sortorder');
begin_sql();
$tx = true; // transaction sanity
foreach ($courses as $course) {
if ($course->sortorder != $n ) { // save db traffic
set_field('course', 'sortorder', $n, 'id', $course->id);
if ($tx && $course->sortorder != $n ) { // save db traffic
$tx = $tx && set_field('course', 'sortorder', $n,
'id', $course->id);
}
$n++;
}
commit_sql();
if ($tx) {
commit_sql();
} else {
rollback_sql();
if (!$safe) {
// if we failed when called with !safe, try
// to recover calling self with safe=true
return fix_course_sortorder($categoryid, $n, true, $depth, $path);
}
}
}
}
set_field('course_categories', 'coursecount', $count, 'id', $categoryid);