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

MDL-79863 qtype_ordering: qtype_ordering add standard syntax for ::name:: in improve export/import of GIFT format

Browse source
This commit is contained in:
Gordon Bateson 2018-06-18 16:48:04 +09:00 • committed by Mathew May
parent 35551217e0
commit 32559a356c
2 changed files with 98 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

133
question/type/ordering/questiontype.php
View file

@ -379,9 +379,6 @@ class qtype_ordering extends question_type {
global $CFG; global $CFG;
require_once($CFG->dirroot.'/question/type/ordering/question.php'); require_once($CFG->dirroot.'/question/type/ordering/question.php');
// Convert $lines to a single a string - for preg_match().
$lines = implode(PHP_EOL, $lines);
// Extract question info from GIFT file $lines. // Extract question info from GIFT file $lines.
$questionname = '[^{]*'; $questionname = '[^{]*';
$selectcount = '\d+'; $selectcount = '\d+';
@ -402,45 +399,94 @@ class qtype_ordering extends question_type {
'LONGEST_ORDERED_SUBSET|'. 'LONGEST_ORDERED_SUBSET|'.
'LONGEST_CONTIGUOUS_SUBSET)?'; 'LONGEST_CONTIGUOUS_SUBSET)?';
$showgrading = '(?:SHOW|TRUE|YES|1|HIDE|FALSE|NO|0)?'; $showgrading = '(?:SHOW|TRUE|YES|1|HIDE|FALSE|NO|0)?';
$search = '/^(' . $questionname . ')\s*\{>\s*(' . $selectcount . ')\s*(' . $selecttype . ')\s*' . $search = '/^\s*>\s*('.$selectcount.')\s*'.
'(' . $layouttype . ')\s*(' . $gradingtype . ')\s*(' . $showgrading . ')\s*(.*?)\s*\}\s*$/s'; '('.$selecttype.')\s*'.
// Item $1 the question name. '('.$layouttype.')\s*'.
// Item $2 the number of items to be shown. '('.$gradingtype.')\s*'.
// Item $3 the extraction/grading type. '('.$showgrading.')\s*'.
// Item $4 the layout type. '(.*?)\s*$/s';
// Item $5 the grading type. // Item $1 the number of items to be shown.
// Item $6 show the grading details (SHOW/HIDE). // Item $2 the extraction/grading type.
// Item $7 the lines of items to be ordered. // Item $3 the layout type.
if (empty($extra) || ! preg_match($search, $lines, $matches)) { // Item $4 the grading type.
// Item $5 show the grading details (SHOW/HIDE).
// Item $6 the lines of items to be ordered.
if (! $extra) {
return false; // Format not recognized.
}
if (! preg_match($search, $extra, $matches)) {
return false; // Format not recognized. return false; // Format not recognized.
} }
$questionname = trim($matches[1]); $selectcount = trim($matches[1]);
$selectcount = trim($matches[2]); $selecttype = trim($matches[2]);
$selecttype = trim($matches[3]); $layouttype = trim($matches[3]);
$layouttype = trim($matches[4]); $gradingtype = trim($matches[4]);
$gradingtype = trim($matches[5]); $showgrading = trim($matches[5]);
$showgrading = trim($matches[6]);
$lines = explode(PHP_EOL, $matches[7]); $answers = preg_split('/[\r\n]+/', $matches[6]);
unset($matches); $answers = array_filter($answers);
if (empty($question)) {
$text = implode(PHP_EOL, $lines);
$text = trim($text);
if ($pos = strpos($text, '{')) {
$text = substr($text, 0, $pos);
}
// extract name
$name = false;
if (substr($text, 0, 2) == '::') {
$text = substr($text, 2);
$pos = strpos($text, '::');
if (is_numeric($pos)) {
$name = substr($text, 0, $pos);
$name = $format->clean_question_name($name);
$text = trim(substr($text, $pos + 2));
}
}
// extract question text format
$format = FORMAT_MOODLE;
if (substr($text, 0, 1) == '[') {
$text = substr($text, 1);
$pos = strpos($text, ']');
if (is_numeric($pos)) {
$format = substr($text, 0, $pos);
switch ($format) {
case 'html': $format = FORMAT_HTML; break;
case 'plain': $format = FORMAT_PLAIN; break;
case 'markdown': $format = FORMAT_MARKDOWN; break;
case 'moodle': $format = FORMAT_MOODLE; break;
}
$text = trim(substr($text, $pos + 1)); // Remove name from text.
}
}
$question = new stdClass();
$question->name = $name;
$question->questiontext = $text;
$question->questiontextformat = $format;
$question->generalfeedback = '';
$question->generalfeedbackformat = FORMAT_MOODLE;
}
$question->qtype = 'ordering'; $question->qtype = 'ordering';
$question->name = trim($question->name);
// Fix empty or long question name. // Fix empty or long question name.
$question->name = $this->fix_questionname($question->name, $questionname); //$question->name = $this->fix_questionname($question->name, $questionname);
// Set "selectcount" field from $selectcount. // Set "selectcount" field from $selectcount.
if (is_numeric($selectcount) && $selectcount > 2 && $selectcount <= count($lines)) { if (is_numeric($selectcount) && $selectcount > 2 && $selectcount <= count($answers)) {
$selectcount = intval($selectcount); $selectcount = intval($selectcount);
} else { } else {
$selectcount = min(6, count($lines)); $selectcount = min(6, count($answers));
} }
$this->set_layout_select_count_grading($question, $layouttype, $selecttype, $selectcount, $gradingtype, $showgrading); $this->set_layout_select_count_grading($question, $layouttype, $selecttype, $selectcount, $gradingtype, $showgrading);
// Remove blank items. // Remove blank items.
$lines = array_map('trim', $lines); $answers = array_map('trim', $answers);
$lines = array_filter($lines); // Remove blanks. $answers = array_filter($answers); // Remove blanks.
// Set up answer arrays. // Set up answer arrays.
$question->answer = array(); $question->answer = array();
@ -453,8 +499,8 @@ class qtype_ordering extends question_type {
// "fraction" fields will be set to correct values later // "fraction" fields will be set to correct values later
// in the save_question_options() method of this class. // in the save_question_options() method of this class.
foreach ($lines as $i => $line) { foreach ($answers as $i => $answer) {
$question->answer[$i] = $line; $question->answer[$i] = $answer;
$question->answerformat[$i] = FORMAT_MOODLE; $question->answerformat[$i] = FORMAT_MOODLE;
$question->fraction[$i] = 1; // Will be reset later in save_question_options(). $question->fraction[$i] = 1; // Will be reset later in save_question_options().
$question->feedback[$i] = ''; $question->feedback[$i] = '';
@ -575,15 +621,28 @@ class qtype_ordering extends question_type {
global $CFG; global $CFG;
require_once($CFG->dirroot.'/question/type/ordering/question.php'); require_once($CFG->dirroot.'/question/type/ordering/question.php');
list($layouttype, $selecttype, $selectcount, $gradingtype, $showgrading) = $this->extract_layout_select_count_grading($question); $output = '';
$output = $question->questiontext.'{>'.$selectcount.' '.
$selecttype.' '. if ($question->name) {
$layouttype.' '. $output .= '::'.$question->name.'::';
$gradingtype.' '.
$showgrading."\n";
foreach ($question->options->answers as $answer) {
$output .= $answer->answer."\n";
} }
switch ($question->questiontextformat) {
case FORMAT_HTML: $output .= '[html]'; break;
case FORMAT_PLAIN: $output .= '[plain]'; break;
case FORMAT_MARKDOWN: $output .= '[markdown]'; break;
case FORMAT_MOODLE: $output .= '[moodle]'; break;
}
$output .= $question->questiontext.'{';
list($layouttype, $selecttype, $selectcount, $gradingtype, $showgrading) = $this->extract_layout_select_count_grading($question);
$output .= ">$selectcount $selecttype $layouttype $gradingtype $showgrading".PHP_EOL;
foreach ($question->options->answers as $answer) {
$output .= $answer->answer.PHP_EOL;
}
$output .= '}'; $output .= '}';
return $output; return $output;
} }

4
question/type/ordering/version.php
View file

@ -29,5 +29,5 @@ $plugin->cron = 0;
$plugin->component = 'qtype_ordering'; $plugin->component = 'qtype_ordering';
$plugin->maturity = MATURITY_STABLE; $plugin->maturity = MATURITY_STABLE;
$plugin->requires = 2010112400; // Moodle 2.0 $plugin->requires = 2010112400; // Moodle 2.0
$plugin->version = 2018052469; $plugin->version = 2018061870;
$plugin->release = '2018-05-24 (69)'; $plugin->release = '2018-06-18 (70)';