mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-25 16:21:47 +02:00
Code Issues Projects Releases Wiki Activity

MDL-32220 question import: files sometimes stored in the wrong context.

Browse Source 
Sadly, this involves a small API change, but I don't believe anyone was
using the argument I had to remove (because we were sometimes passing a
wrong value, and there is not way to compute the right value at that
point in the code.)

Also sadly, the code to compute the context we are importing into is now
rather spaghetti-like, but it works.
This commit is contained in:
Tim Hunt
2012-03-27 17:41:14 +01:00
parent a280078197
commit 4d18892676
8 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
question/format.php
View File

@@ -128,6 +128,7 @@ class qformat_default {
debugging('You shouldn\'t call setCategory after setQuestions');
}
$this->category = $category;
$this->importcontext = get_context_instance_by_id($this->category->contextid);
}
/**
@@ -311,9 +312,6 @@ class qformat_default {
public function importprocess($category) {
global $USER, $CFG, $DB, $OUTPUT;
$context = $category->context;
$this->importcontext = $context;
// reset the timer in case file upload was slow
set_time_limit(0);
@@ -325,7 +323,7 @@ class qformat_default {
return false;
}
if (!$questions = $this->readquestions($lines, $context)) { // Extract all the questions
if (!$questions = $this->readquestions($lines)) { // Extract all the questions
echo $OUTPUT->notification(get_string('noquestionsinfile', 'question'));
return false;
}
@@ -397,7 +395,7 @@ class qformat_default {
}
continue;
}
$question->context = $context;
$question->context = $this->importcontext;
$count++;
@@ -415,13 +413,13 @@ class qformat_default {
if (isset($question->questiontextfiles)) {
foreach ($question->questiontextfiles as $file) {
question_bank::get_qtype($question->qtype)->import_file(
$context, 'question', 'questiontext', $question->id, $file);
$this->importcontext, 'question', 'questiontext', $question->id, $file);
}
}
if (isset($question->generalfeedbackfiles)) {
foreach ($question->generalfeedbackfiles as $file) {
question_bank::get_qtype($question->qtype)->import_file(
$context, 'question', 'generalfeedback', $question->id, $file);
$this->importcontext, 'question', 'generalfeedback', $question->id, $file);
}
}
@@ -507,6 +505,7 @@ class qformat_default {
} else {
$context = get_context_instance_by_id($this->category->contextid);
}
$this->importcontext = $context;
// Now create any categories that need to be created.
foreach ($catnames as $catname) {
@@ -556,14 +555,19 @@ class qformat_default {
* readquestion(). Questions are defined as anything
* between blank lines.
*
* NOTE this method used to take $context as a second argument. However, at
* the point where this method was called, it was impossible to know what
* context the quetsions were going to be saved into, so the value could be
* wrong. Also, none of the standard question formats were using this argument,
* so it was removed. See MDL-32220.
*
* If your format does not use blank lines as a delimiter
* then you will need to override this method. Even then
* try to use readquestion for each question
* @param array lines array of lines from readdata
* @param object $context
* @return array array of question objects
*/
protected function readquestions($lines, $context) {
protected function readquestions($lines) {
$questions = array();
$currentquestion = array();
@@ -583,7 +587,7 @@ class qformat_default {
}
if (!empty($currentquestion)) { // There may be a final question
if ($question = $this->readquestion($currentquestion, $context)) {
if ($question = $this->readquestion($currentquestion)) {
$questions[] = $question;
}
}

2
question/format/aiken/format.php
View File

@@ -58,7 +58,7 @@ class qformat_aiken extends qformat_default {
return true;
}
public function readquestions($lines, $context) {
public function readquestions($lines) {
$questions = array();
$question = $this->defaultquestion();
$endchar = chr(13);

2
question/format/examview/format.php
View File

@@ -149,7 +149,7 @@ class qformat_examview extends qformat_default {
return str_replace('’', "'", $text);
}
protected function readquestions($lines, $context) {
protected function readquestions($lines) {
/// Parses an array of lines into an array of questions,
/// where each item is a question object as defined by
/// readquestion().

2
question/format/learnwise/format.php
View File

@@ -46,7 +46,7 @@ class qformat_learnwise extends qformat_default {
return true;
}
protected function readquestions($lines, $context) {
protected function readquestions($lines) {
$questions = array();
$currentquestion = array();

2
question/format/multianswer/format.php
View File

@@ -40,7 +40,7 @@ class qformat_multianswer extends qformat_default {
return true;
}
protected function readquestions($lines, $context) {
protected function readquestions($lines) {
// For this class the method has been simplified as
// there can never be more than one question for a
// multianswer import

8
question/format/upgrade.txt
View File

@@ -1,5 +1,13 @@
This files describes API changes for question import/export format plugins.
=== 2.1.5 / 2.2.3 / 2.3 ===
* The readquestions method used to take a second argument $context. However, at
the point where this method was called, it was impossible to know what
context the quetsions were going to be saved into, so the value could be
wrong. Also, none of the standard question formats were using this argument,
so it was removed. See MDL-32220.
=== 2.2 ===
* The plugin name used to be defined in a string called the same thing as the

2
question/format/webct/format.php
View File

@@ -172,7 +172,7 @@ class qformat_webct extends qformat_default {
return true;
}
protected function readquestions($lines, $context) {
protected function readquestions($lines) {
$webctnumberregex =
'[+-]?([0-9]+(\\.[0-9]*)?|\\.[0-9]+)((e|E|\\*10\\*\\*)([+-]?[0-9]+|\\([+-]?[0-9]+\\)))?';

2
question/format/xml/format.php
View File

@@ -889,7 +889,7 @@ class qformat_xml extends qformat_default {
* @param stdClass $context
* @return array (of objects) question objects.
*/
protected function readquestions($lines, $context) {
protected function readquestions($lines) {
// We just need it as one big string
$text = implode($lines, ' ');
unset($lines);