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

Fix bug #2334 - New unique undes in course table causes course move to fail

Browse Source 
There were several issues in fix_coursesortorder() that were fixed. Mainly:
 - the recursive calls dropped the $safe parameter
 - we did not even try to maintain uniqueness in the sortorder field across categories

http://moodle.org/bugs/bug.php?op=show&bugid=2334
This commit is contained in:
martinlanghoff
2005-01-13 02:23:39 +00:00
parent 105dece910
commit 5cba81fd45
1 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/datalib.php
+42 -22
View File
@@ -2071,9 +2071,11 @@ function fix_course_sortorder($categoryid=0, $n=0, $safe=0) {
$count = 0;
$n=100;
$catgap = 1000; # "standard" category gap
$tolerance = 200; # how "close" categories can get
// get some basic info
// get some basic info about courses in the category
$info = get_record_sql('SELECT MIN(sortorder) AS min,
MAX(sortorder) AS max,
COUNT(sortorder) AS count
@@ -2086,30 +2088,47 @@ function fix_course_sortorder($categoryid=0, $n=0, $safe=0) {
unset($info);
}
// $hasgap flag indicates whether there's a gap in the sequence
$hasgap = false;
if ($max-$min+1 != $count) {
$hasgap = true;
}
// $mustshift indicates whether the sequence must be shifted to
// meet its range
$mustshift = false;
if ($min < $n+$tolerance || $min > $n+$tolerance+$catgap ) {
$mustshift = true;
}
// actually sort only if there are courses,
// and we meet one ofthe triggers:
// - safe flag
// - they are not in a continuos block
// - they are too close to the 'bottom'
if ($count && ( $safe
|| ($max-$min+1!=$count)
|| $min < 10 ) ) {
if ($courses = get_records_sql("SELECT c.id, c.sortorder FROM {$CFG->prefix}course c WHERE category=$categoryid ORDER BY c.sortorder ASC")) {
begin_sql();
// find the ideal starting point
if ( ($min<$n&&$n<$max) || ($n+$count>=$min) || ($min<10) ) {
$n = $max+100; // this is usually the ideal solution
// if we are aiming way too high, try to bring it back to earth
if ($n > 100+3*$count) {
if ($min > 100+$count){
$n = 100;
}
}
if ($count && ( $safe || $hasgap || $mustshift ) ) {
// special, optimized case where all we need is to shift
if ( $mustshift && !$safe && !$hasgap) {
$shift = $n + $catgap - $min;
// UPDATE course SET sortorder=sortorder+$shift
execute_sql("UPDATE {$CFG->prefix}course
SET sortorder=sortorder+$shift
WHERE category=$categoryid", 0);
$n = $n + $catgap + $count;
} else { // do it slowly
$n = $n + $catgap;
// if the new sequence overlaps the current sequence, lack of transactions
// will stop us -- shift things aside for a moment...
if ($n >= $min && $n+$count+1 < $min && $CFG->dbtype==='mysql') {
$shift = $n + $count + 100;
execute_sql("UPDATE {$CFG->prefix}course
SET sortorder=sortorder+$shift
WHERE category=$categoryid", 0);
}
$courses = get_courses($categoryid, 'c.sortorder ASC', 'c.id,c.sortorder');
begin_sql();
foreach ($courses as $course) {
if ($course->sortorder != $n ) { // save db traffic
set_field('course', 'sortorder', $n, 'id', $course->id);
@@ -2117,18 +2136,19 @@ function fix_course_sortorder($categoryid=0, $n=0, $safe=0) {
$n++;
}
commit_sql();
}
}
}
set_field("course_categories", "coursecount", $count, "id", $categoryid);
$n=0;
if ($categories = get_categories($categoryid)) {
foreach ($categories as $category) {
$n = fix_course_sortorder($category->id, $n);
}
}
return $n;
return $n+1;
}
/**