rating MDL-21657 shifted upgrade_module_ratings()

diff --git a/lib/db/upgradelib.php b/lib/db/upgradelib.php
index a9dc743..911eb48 100644 (file)
--- a/lib/db/upgradelib.php
+++ b/lib/db/upgradelib.php
@@ -395,48 +395,4 @@ function upgrade_cleanup_unwanted_block_contexts($contextidarray) {
     $outcome4 = $DB->delete_records_select('context', 'id IN ('.$blockcontextidsstring.')');
 
     return ($outcome1 && $outcome2 && $outcome4 && $outcome4);
-}
-
-function upgrade_module_ratings($ratingssql, $modulename) {
-    global $DB;
-    $contextid = null;
-    $contextarray = array();
-    $result = true;
-    $i=0;
-
-    $ratings = $DB->get_records_sql($ratingssql);
-
-    foreach ($ratings as $old_rating) {
-        if($i++%500==0) {
-            upgrade_set_timeout(60);//prevent a timeout
-        }
-
-        //all posts within a given forum, glossary etc will have the same context id so store them in an array
-        if( !array_key_exists($old_rating->mid, $contextarray) ) {
-            $sql = 'select cxt.id from {course_modules} cm inner join {modules} m on cm.module=m.id
-inner join {context} cxt on cxt.instanceid=cm.id
-where m.name=:modulename and cm.instance=:moduleinstanceid and cxt.contextlevel='.CONTEXT_MODULE;
-            $params = array();
-            $params['moduleinstanceid'] = $old_rating->mid;
-            $params['modulename'] = $modulename;
-            $results = $DB->get_record_sql($sql, $params);
-            $contextarray[$old_rating->mid] = $results->id;
-        }
-        $contextid = $contextarray[$old_rating->mid];
-
-        $rating = new stdclass;
-        $rating->contextid = $contextid;
-        $rating->scaleid = $old_rating->scale;
-        $rating->itemid = $old_rating->itemid;
-        $rating->rating = $old_rating->rating;
-        $rating->userid = $old_rating->userid;
-        $rating->timecreated = $old_rating->timecreated;
-        $rating->timemodified = $old_rating->timemodified;
-
-        $result = $result && $DB->insert_record('rating', $rating);
-    }
-
-    //$ratings->close();
-
-    return $result;
-}
+}
\ No newline at end of file

diff --git a/lib/upgradelib.php b/lib/upgradelib.php
index ed78998..9f594d5 100644 (file)
--- a/lib/upgradelib.php
+++ b/lib/upgradelib.php
@@ -1508,3 +1508,54 @@ function admin_mnet_method_profile(Zend_Server_Reflection_Function_Abstract $fun
     }
     return $profile;
 }
+
+/**
+ * Shifts ratings from modules into the central rating table
+ *
+ * @param string $ratingssql sql to return the module's rating
+ * @param string $modulename the name of the module
+ * @return boolean success flag
+ */
+function upgrade_module_ratings($ratingssql, $modulename) {
+    global $DB;
+    $contextid = null;
+    $contextarray = array();
+    $result = true;
+    $i=0;
+
+    $ratings = $DB->get_records_sql($ratingssql);
+
+    foreach ($ratings as $old_rating) {
+        if($i++%500==0) {
+            upgrade_set_timeout(60);//prevent a timeout
+        }
+
+        //all posts within a given forum, glossary etc will have the same context id so store them in an array
+        if( !array_key_exists($old_rating->mid, $contextarray) ) {
+            $sql = 'select cxt.id from {course_modules} cm inner join {modules} m on cm.module=m.id
+inner join {context} cxt on cxt.instanceid=cm.id
+where m.name=:modulename and cm.instance=:moduleinstanceid and cxt.contextlevel='.CONTEXT_MODULE;
+            $params = array();
+            $params['moduleinstanceid'] = $old_rating->mid;
+            $params['modulename'] = $modulename;
+            $results = $DB->get_record_sql($sql, $params);
+            $contextarray[$old_rating->mid] = $results->id;
+        }
+        $contextid = $contextarray[$old_rating->mid];
+
+        $rating = new stdclass;
+        $rating->contextid = $contextid;
+        $rating->scaleid = $old_rating->scale;
+        $rating->itemid = $old_rating->itemid;
+        $rating->rating = $old_rating->rating;
+        $rating->userid = $old_rating->userid;
+        $rating->timecreated = $old_rating->timecreated;
+        $rating->timemodified = $old_rating->timemodified;
+
+        $result = $result && $DB->insert_record('rating', $rating);
+    }
+
+    //$ratings->close();
+
+    return $result;
+}