Permalink
Browse files

MDL-37172 Hardcoded strings in some question imports formats

AMOS BEGIN
CPY [unknownorunhandledtype,qformat_blackboard_six],[unknownorunhandledtype,question]
AMOS END
  • Loading branch information...
1 parent df93b15 commit d53ba71a24bd23d5e510b74ff0770a506b0d81d1 Jean-Michel Vedrine committed Dec 22, 2012
View
@@ -416,6 +416,7 @@
$string['technicalinforightsummary'] = 'Right answer summary: {$a}';
$string['technicalinfostate'] = 'Question state: {$a}';
$string['unknownbehaviour'] = 'Unknown behaviour: {$a}.';
+$string['unknownorunhandledtype'] = 'Unknown or unhandled question type: {$a}';
$string['unknownquestion'] = 'Unknown question: {$a}.';
$string['unknownquestioncatregory'] = 'Unknown question category: {$a}.';
$string['unknownquestiontype'] = 'Unknown question type: {$a}.';
@@ -87,7 +87,7 @@ protected function readquestions($text) {
$this->process_essay($question, $questions);
break;
default:
- $this->error(get_string('unknownorunhandledtype', 'qformat_blackboard_six', $question->qtype));
+ $this->error(get_string('unknownorunhandledtype', 'question', $question->qtype));
break;
}
}
@@ -184,6 +184,7 @@ public function readquestions($lines) {
}
public function readquestion($qrec) {
+ global $OUTPUT;
$type = trim($qrec['@']['type']);
$question = $this->defaultquestion();
@@ -224,7 +225,7 @@ public function readquestion($qrec) {
break;
break;
default:
- print("<p>Question type ".$type." import not supported for ".$question->questiontext."<p>");
+ echo $OUTPUT->notification(get_string('unknownorunhandledtype', 'question', $type));
$question = null;
}
@@ -67,6 +67,8 @@ protected function readquestions($lines) {
}
protected function readquestion($lines) {
+ global $OUTPUT;
+
$text = implode(' ', $lines);
$text = str_replace(array('\t','\n','\r'), array('','',''), $text);
@@ -131,7 +133,7 @@ protected function readquestion($lines) {
}
} else {
- echo "<p>I don't understand this question type (type = <strong>$type</strong>).</p>\n";
+ echo $OUTPUT->notification(get_string('unknownorunhandledtype', 'question', $type));
}
$question = $this->defaultquestion();
@@ -52,11 +52,11 @@
*/
class qformat_missingword extends qformat_default {
- function provide_import() {
+ public function provide_import() {
return true;
}
- function readquestion($lines) {
+ public function readquestion($lines) {
/// Given an array of lines known to define a question in
/// this format, this function converts it into a question
/// object suitable for processing and insertion into Moodle.
@@ -70,28 +70,23 @@ function readquestion($lines) {
$answerstart = strpos($text, "{");
if ($answerstart === false) {
- if ($this->displayerrors) {
- echo "<p>$text<p>Could not find a {";
- }
+ $this->error(get_string('beginanswernotfound', 'qformat_missingword'), $text);
return false;
}
$answerfinish = strpos($text, "}");
if ($answerfinish === false) {
- if ($this->displayerrors) {
- echo "<p>$text<p>Could not find a }";
- }
+ $this->error(get_string('endanswernotfound', 'qformat_missingword'), $text);
return false;
}
$answerlength = $answerfinish - $answerstart;
$answertext = substr($text, $answerstart + 1, $answerlength - 1);
- /// Save the new question text
+ // Save the new question text.
$question->questiontext = substr_replace($text, "_____", $answerstart, $answerlength+1);
$question->name = $this->create_default_question_name($question->questiontext, get_string('questionname', 'question'));
-
/// Parse the answers
$answertext = str_replace("=", "~=", $answertext);
$answers = explode("~", $answertext);
@@ -105,10 +100,8 @@ function readquestion($lines) {
$countanswers = count($answers);
switch ($countanswers) {
- case 0: // invalid question
- if ($this->displayerrors) {
- echo "<p>No answers found in $answertext";
- }
+ case 0: // Invalid question.
+ $this->error(get_string('noanswerfound', 'qformat_missingword'), $answertext);
return false;
case 1:
@@ -120,12 +113,14 @@ function readquestion($lines) {
}
$question->answer[] = $answer;
$question->fraction[] = 1;
- $question->feedback[] = "";
+ $question->feedback[] = array('text' => '', 'format' => FORMAT_HTML);
return $question;
default:
$question->qtype = 'multichoice';
+ $question = $this->add_blank_combined_feedback($question);
+ $question->single = 1; // Only one answer allowed.
foreach ($answers as $key => $answer) {
$answer = trim($answer);
@@ -166,8 +161,8 @@ function readquestion($lines) {
# $question->fraction[$key] = 0;
$question->fraction[$key] = $answeight;
}
- $question->answer[$key] = $answer;
- $question->feedback[$key] = $comment;
+ $question->answer[$key] = array('text' => $answer, 'format' => FORMAT_HTML);
+ $question->feedback[$key] = array('text' => $comment, 'format' => FORMAT_HTML);
}
return $question;
@@ -26,3 +26,6 @@
$string['pluginname'] = 'Missing word format';
$string['pluginname_help'] = 'Missing word format enables questions to be imported via text file.';
$string['pluginname_link'] = 'Missing word format';
+$string['beginanswernotfound'] = 'Could not find a required "{" character in imported file content.';
+$string['endanswernotfound'] = 'Could not find a required "}" character in imported file content.';
+$string['noanswerfound'] = 'No answers found in question';
@@ -0,0 +1,3 @@
+As soon as we begin to explore our body parts as infants
+we become students of {=anatomy and physiology ~reflexology
+~science ~experiment}, and in a sense we remain students for life.
@@ -0,0 +1,2 @@
+You can use the missing word format to import questions
+into both Moodle's Question bank and {=Lesson} activity.
@@ -0,0 +1,2 @@
+This is {=the best answer#comment on the best answer ~75%a good
+answer#comment on the good answer ~a wrong one#comment on the bad answer}
@@ -93,23 +93,23 @@ protected function writequestion($question) {
}
$expout .= "</ul>\n";
break;
- case SHORTANSWER:
+ case 'shortanswer':
$expout .= html_writer::start_tag('ul', array('class' => 'shortanswer'));
$expout .= html_writer::start_tag('li');
$expout .= html_writer::label(get_string('answer'), 'quest_'.$id, false, array('class' => 'accesshide'));
$expout .= html_writer::empty_tag('input', array('id' => "quest_$id", 'name' => "quest_$id", 'type' => 'text'));
$expout .= html_writer::end_tag('li');
$expout .= html_writer::end_tag('ul');
break;
- case NUMERICAL:
+ case 'numerical':
$expout .= html_writer::start_tag('ul', array('class' => 'numerical'));
$expout .= html_writer::start_tag('li');
$expout .= html_writer::label(get_string('answer'), 'quest_'.$id, false, array('class' => 'accesshide'));
$expout .= html_writer::empty_tag('input', array('id' => "quest_$id", 'name' => "quest_$id", 'type' => 'text'));
$expout .= html_writer::end_tag('li');
$expout .= html_writer::end_tag('ul');
break;
- case MATCH:
+ case 'match':
$expout .= html_writer::start_tag('ul', array('class' => 'match'));
// build answer list
@@ -140,11 +140,9 @@ protected function writequestion($question) {
break;
case 'description':
break;
- case 'multichoice':
- $expout .= "<!-- CLOZE type is not supported -->\n";
- break;
+ case 'multianswer':
default:
- echo $OUTPUT->notification("No handler for qtype $question->qtype for GIFT export" );
+ $expout .= "<!-- export of $question->qtype type is not supported -->\n";
}
// close off div
$expout .= "</div>\n\n\n";

0 comments on commit d53ba71

Please sign in to comment.