From 186b0a153733a90df2f264bca56a104408bd1f6e Mon Sep 17 00:00:00 2001 From: samulik Date: Mon, 24 Sep 2007 06:32:14 +0000 Subject: [PATCH] MDL-1883 - /course/scales.php very slow. "Backported" the fix by Petr from 1.9 to 1.8. Not a direct merge as the code has been refactored. --- course/scales.php | 40 ++++++++++++------------- lib/moodlelib.php | 68 +++++++++++++++++++++++++++++------------- mod/assignment/lib.php | 10 +++++++ mod/forum/lib.php | 10 +++++++ mod/glossary/lib.php | 10 +++++++ mod/hotpot/lib.php | 11 +++++++ mod/journal/lib.php | 10 +++++++ mod/lams/lib.php | 11 +++++++ 8 files changed, 129 insertions(+), 41 deletions(-) diff --git a/course/scales.php b/course/scales.php index efbe8cf763c..40f6fc3cc65 100644 --- a/course/scales.php +++ b/course/scales.php @@ -146,15 +146,15 @@ $scale->description = ""; } - //Calculate the uses + //Check if the scale is in use if ($scale->courseid == 0) { - $scale_uses = site_scale_used($scale->id,$courses); + $scale_used = site_scale_used($scale->id,$courses); } else { - $scale_uses = course_scale_used($course->id,$scale->id); + $scale_used = course_scale_used($course->id,$scale->id); } - //Check for scale_uses - if (!empty($scale_uses)) { + //Check for scale use + if ($scale_used)) { error("Scale is in use and cannot be modified",$CFG->wwwroot.'/course/scales.php?id='.$course->id); } @@ -210,7 +210,7 @@ echo ""; echo ""; echo ""; - echo "".get_string("usedinnplaces","",$scale_uses); + echo "$stractivities: ".($scale_used ? get_string("yes") : get_string("no")); echo ""; echo ""; } @@ -240,15 +240,15 @@ error("Scale ID was incorrect"); } - //Calculate the uses + //Check if the scale is in use if ($scale->courseid == 0) { - $scale_uses = site_scale_used($scale->id,$courses); + $scale_used = site_scale_used($scale->id,$courses); } else { - $scale_uses = course_scale_used($course->id,$scale->id); + $scale_used = course_scale_used($course->id,$scale->id); } - //Check for scale_uses - if (!empty($scale_uses)) { + //Check for scale use + if ($scale_used) { error("Scale is in use and cannot be deleted",$CFG->wwwroot.'/course/scales.php?id='.$course->id); } @@ -271,15 +271,15 @@ error("Scale ID was incorrect"); } - //Calculate the uses + //Check if the scale is in use if ($scale->courseid == 0) { - $scale_uses = site_scale_used($scale->id,$courses); + $scale_used = site_scale_used($scale->id,$courses); } else { - $scale_uses = course_scale_used($course->id,$scale->id); + $scale_used = course_scale_used($course->id,$scale->id); } - //Check for scale_uses - if (!empty($scale_uses)) { + //Check for scale use + if ($scale_used)) { error("Scale is in use and cannot be moved",$CFG->wwwroot.'/course/scales.php?id='.$course->id); } @@ -424,18 +424,18 @@ $line = array(); $line[] = "name\" href=\"$CFG->wwwroot/course/scales.php?id=$course->id&scaleid=$scale->id&action=details\" "."onclick=\"return openpopup('/course/scales.php?id=$course->id\&scaleid=$scale->id&action=details', 'scale', 'menubar=0,location=0,scrollbars,resizable,width=600,height=450', 0);\">".$scale->name."
".str_replace(",",", ",$scale->scale).""; if (!empty($scale->courseid)) { - $scales_uses = course_scale_used($course->id,$scale->id); + $scale_used = course_scale_used($course->id,$scale->id); } else { - $scales_uses = site_scale_used($scale->id,$courses); + $scale_used = site_scale_used($scale->id,$courses); } - $line[] = $scales_uses; + $line[] = $scale_used ? get_string("yes") : get_string("no"); if ($incustom) { $line[] = $strcustomscale; } else { $line[] = $strstandardscale; } $buttons = ""; - if (empty($scales_uses) && ($incustom || has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM, SITEID)))) { + if (!$scale_used && ($incustom || has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM, SITEID)))) { $buttons .= "id&scaleid=$scale->id&action=edit\">pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"$stredit\" /> "; if ($incustom && has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM, SITEID))) { diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 312ca7f6591..24b8e9722da 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -5953,12 +5953,11 @@ function make_grades_menu($gradingtype) { } /** - * This function returns the nummber of activities - * using scaleid in a courseid + * Returns true if a scale is in use in the given course. * - * @param int $courseid ? - * @param int $scaleid ? - * @return int + * @param int $courseid The course to be checked. + * @param int $scaleid The scale to be checked. + * @return boolean * @todo Finish documenting this function */ function course_scale_used($courseid, $scaleid) { @@ -5976,42 +5975,69 @@ function course_scale_used($courseid, $scaleid) { $function_name = $cm->modname.'_scale_used'; if (function_exists($function_name)) { if ($function_name($cm->instance,$scaleid)) { - $return++; + return true; } } } } } } - return $return; + return false; } /** - * This function returns the nummber of activities - * using scaleid in the entire site + * Returns true if a scale is in use anywhere on the site. * - * @param int $scaleid ? - * @return int - * @todo Finish documenting this function. Is return type correct? + * @param int $scaleid The scale to be checked. + * @param array $courses The site courses, needed is the old way to check has to be used. + * @return boolean */ function site_scale_used($scaleid,&$courses) { + if (empty($scaleid)) { + return false; + } + global $CFG; $return = 0; - if (!is_array($courses) || count($courses) == 0) { - $courses = get_courses("all",false,"c.id,c.shortname"); - } - - if (!empty($scaleid)) { - if (is_array($courses) && count($courses) > 0) { - foreach ($courses as $course) { - $return += course_scale_used($course->id,$scaleid); + $legacy_mods = false; + if ($mods = get_records('modules', 'visible', 1)) { + foreach ($mods as $mod) { + //Check $mod->name/lib.php exists + if (file_exists($CFG->dirroot.'/mod/'.$mod->name.'/lib.php')) { + include_once($CFG->dirroot.'/mod/'.$mod->name.'/lib.php'); + $function_name = $mod->name.'_scale_used_anywhere'; + $old_function_name = $mod->name.'_scale_used'; + if (function_exists($function_name)) { + if ($function_name($scaleid)) { + return true; + } + } else if (function_exists($old_function_name)) { + $legacy_mods = true; + debugging('Please notify the developer of module "'.$mod->name.'" that new function module_scale_used_anywhere() should be implemented.', DEBUG_DEVELOPER); + break; + } } } } - return $return; + + // some mods are missing the new xxx_scale_used_anywhere() - use the really slow old way + if ($legacy_mods) { + if (!is_array($courses) || count($courses) == 0) { + $courses = get_courses("all",false,"c.id,c.shortname"); + } + if (is_array($courses) && count($courses) > 0) { + foreach ($courses as $course) { + if (course_scale_used($course->id,$scaleid)) { + return true; + } + } + } + } + + return false; } /** diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index 9fa148c17d3..667182f2c73 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -1980,6 +1980,16 @@ function assignment_scale_used ($assignmentid, $scaleid) { return $return; } +/** + * Returns true if the scale is in use in the system. + * + * @param $scaleid int The scale to be counted. + * @return boolean + */ +function assignment_scale_used_anywhere($scaleid) { + return record_exists("assignment","grade","-$scaleid"); +} + /** * Make sure up-to-date events are created for all assignment instances * diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 57f96046002..aee4b9c6c3d 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -1222,6 +1222,16 @@ function forum_scale_used ($forumid,$scaleid) { return $return; } +/** + * Returns true if the scale is in use in the system. + * + * @param $scaleid int The scale to be counted. + * @return boolean + */ +function forum_scale_used_anywhere($scaleid) { + return record_exists("forum","scale","-$scaleid"); +} + // SQL FUNCTIONS /////////////////////////////////////////////////////////// /** diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 5a8e72a8c70..01f79a55188 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -401,6 +401,16 @@ function glossary_scale_used ($glossaryid,$scaleid) { return $return; } +/** + * Returns true if the scale is in use in the system. + * + * @param $scaleid int The scale to be counted. + * @return boolean + */ +function glossary_scale_used_anywhere($scaleid) { + return record_exists("glossary","scale","-$scaleid"); +} + ////////////////////////////////////////////////////////////////////////////////////// /// Any other glossary functions go here. Each of them must have a name that /// starts with glossary_ diff --git a/mod/hotpot/lib.php b/mod/hotpot/lib.php index b1191e8d902..4647809db35 100644 --- a/mod/hotpot/lib.php +++ b/mod/hotpot/lib.php @@ -1225,6 +1225,17 @@ function hotpot_scale_used ($hotpotid, $scaleid) { return $report; } +/** + * Returns true if the scale is in use in the system. + * + * @param $scaleid int The scale to be counted. + * @return boolean + */ +function hotpot_scale_used_anywhere($scaleid) { +// return record_exists("hotpot","scale","-$scaleid"); + return false; // Scales are not used by Hotpot module +} + ////////////////////////////////////////////////////////// /// Any other hotpot functions go here. /// Each of them must have a name that starts with hotpot diff --git a/mod/journal/lib.php b/mod/journal/lib.php index 0f522e53ab4..d2bcd084dd3 100644 --- a/mod/journal/lib.php +++ b/mod/journal/lib.php @@ -307,6 +307,16 @@ function journal_scale_used ($journalid,$scaleid) { return $return; } +/** + * Returns true if the scale is in use in the system. + * + * @param $scaleid int The scale to be counted. + * @return boolean + */ +function journal_scale_used_anywhere($scaleid) { + return record_exists("journal","assessed","-$scaleid"); +} + // SQL FUNCTIONS /////////////////////////////////////////////////////////////////// function journal_get_users_done($journal) { diff --git a/mod/lams/lib.php b/mod/lams/lib.php index f96f32877a9..fb46b74f0cd 100644 --- a/mod/lams/lib.php +++ b/mod/lams/lib.php @@ -140,6 +140,17 @@ function lams_scale_used ($lamsid,$scaleid) { return $return; } +/** + * Returns true if the scale is in use in the system. + * + * @param $scaleid int The scale to be counted. + * @return boolean + */ +function lams_scale_used_anywhere($scaleid) { +// return record_exists("lams","scale","-$scaleid"); + return false; +} + ////////////////////////////////////////////////////////////////////////////////////// /// Any other lams functions go here. Each of them must have a name that /// starts with lams_