moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-40893-24' of https://github.com/mr-russ/moodle into MOODLE_24_STABLE

Browse source
This commit is contained in:
Dan Poltawski 2013-08-19 14:50:18 +08:00
commit ab97bc0a1e
1 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

42
backup/moodle2/restore_qtype_plugin.class.php
View file

@ -35,6 +35,18 @@ defined('MOODLE_INTERNAL') || die();
*/ */
abstract class restore_qtype_plugin extends restore_plugin { abstract class restore_qtype_plugin extends restore_plugin {
/*
* A simple answer to id cache for a single questions answers.
* @var array
*/
private $questionanswercache = array();
/*
* The id of the current question in the questionanswercache.
* @var int
*/
private $questionanswercacheid = null;
/** /**
* Add to $paths the restore_path_elements needed * Add to $paths the restore_path_elements needed
* to handle question_answers for a given question * to handle question_answers for a given question
@ -147,38 +159,32 @@ abstract class restore_qtype_plugin extends restore_plugin {
// The question existed, we need to map the existing question_answers // The question existed, we need to map the existing question_answers
} else { } else {
// Look in question_answers by answertext matching // Have we cached the current question?
$sql = 'SELECT id if ($this->questionanswercacheid !== $newquestionid) {
FROM {question_answers} // The question changed, purge and start again!
WHERE question = ? $this->questionanswercache = array();
AND ' . $DB->sql_compare_text('answer', 255) . ' = ' . $DB->sql_compare_text('?', 255);
$params = array($newquestionid, $data->answertext);
$newitemid = $DB->get_field_sql($sql, $params);
// Not able to find the answer, let's try cleaning the answertext
// of all the question answers in DB as slower fallback. MDL-30018.
if (!$newitemid) {
$params = array('question' => $newquestionid); $params = array('question' => $newquestionid);
$answers = $DB->get_records('question_answers', $params, '', 'id, answer'); $answers = $DB->get_records('question_answers', $params, '', 'id, answer');
$this->questionanswercacheid = $newquestionid;
// Cache all cleaned answers for a simple text match.
foreach ($answers as $answer) { foreach ($answers as $answer) {
// Clean in the same way than {@link xml_writer::xml_safe_utf8()}. // MDL-30018: Clean in the same way as {@link xml_writer::xml_safe_utf8()}.
$clean = preg_replace('/[\x-\x8\xb-\xc\xe-\x1f\x7f]/is','', $answer->answer); // Clean CTRL chars. $clean = preg_replace('/[\x-\x8\xb-\xc\xe-\x1f\x7f]/is','', $answer->answer); // Clean CTRL chars.
$clean = preg_replace("/\r\n|\r/", "\n", $clean); // Normalize line ending. $clean = preg_replace("/\r\n|\r/", "\n", $clean); // Normalize line ending.
if ($clean === $data->answertext) { $this->questionanswercache[$clean] = $answer->id;
$newitemid = $data->id;
}
} }
} }
// If we haven't found the newitemid, something has gone really wrong, question in DB if (!isset($this->questionanswercache[$data->answertext])) {
// is missing answers, exception // If we haven't found the matching answer, something has gone really wrong, the question in the DB
if (!$newitemid) { // is missing answers, throw an exception.
$info = new stdClass(); $info = new stdClass();
$info->filequestionid = $oldquestionid; $info->filequestionid = $oldquestionid;
$info->dbquestionid = $newquestionid; $info->dbquestionid = $newquestionid;
$info->answer = $data->answertext; $info->answer = $data->answertext;
throw new restore_step_exception('error_question_answers_missing_in_db', $info); throw new restore_step_exception('error_question_answers_missing_in_db', $info);
} }
$newitemid = $this->questionanswercache[$data->answertext];
} }
// Create mapping (we'll use this intensively when restoring question_states. And also answerfeedback files) // Create mapping (we'll use this intensively when restoring question_states. And also answerfeedback files)
$this->set_mapping('question_answer', $oldid, $newitemid); $this->set_mapping('question_answer', $oldid, $newitemid);