Permalink
Browse files

Merge branch 'MDL-34483_23' of git://github.com/timhunt/moodle into M…

…OODLE_23_STABLE
  • Loading branch information...
2 parents d4533f6 + 0b7dfe1 commit c04ddf28f83238fd36135da47762ebec04c21827 @danpoltawski danpoltawski committed Jul 31, 2012
Showing with 275 additions and 91 deletions.
  1. +111 −91 question/format/examview/format.php
  2. +164 −0 question/format/examview/tests/fixtures/questions.examview.xml
View
202 question/format/examview/format.php
@@ -26,7 +26,7 @@
defined('MOODLE_INTERNAL') || die();
-require_once ($CFG->libdir . '/xmlize.php');
+require_once($CFG->libdir . '/xmlize.php');
/**
@@ -46,61 +46,83 @@ class qformat_examview extends qformat_default {
'mtf' => 99,
'nr' => NUMERICAL,
'pr' => 99,
- 'es' => 99,
+ 'es' => ESSAY,
'ca' => 99,
'ot' => 99,
- 'sa' => ESSAY
+ 'sa' => SHORTANSWER
);
public $matching_questions = array();
- function provide_import() {
+ public function provide_import() {
return true;
}
+ public function mime_type() {
+ return 'application/xml';
+ }
+
/**
* unxmlise reconstructs part of the xml data structure in order
* to identify the actual data therein
* @param array $xml section of the xml data structure
* @return string data with evrything else removed
*/
- function unxmlise( $xml ) {
- // if it's not an array then it's probably just data
+ protected function unxmlise( $xml ) {
+ // If it's not an array then it's probably just data.
if (!is_array($xml)) {
$text = s($xml);
- }
- else {
- // otherwise parse the array
+ } else {
+ // Otherwise parse the array.
$text = '';
- foreach ($xml as $tag=>$data) {
- // if tag is '@' then it's attributes and we don't care
+ foreach ($xml as $tag => $data) {
+ // If tag is '@' then it's attributes and we don't care.
if ($tag!=='@') {
$text = $text . $this->unxmlise( $data );
}
}
}
- // currently we throw the tags we found
+ // Currently we throw the tags we found.
$text = strip_tags($text);
return $text;
}
+ protected function text_field($text) {
+ return array(
+ 'text' => htmlspecialchars(trim($text), ENT_NOQUOTES),
+ 'format' => FORMAT_HTML,
+ 'files' => array(),
+ );
+ }
- function parse_matching_groups($matching_groups)
- {
+ protected function add_blank_combined_feedback($question) {
+ $question->correctfeedback['text'] = '';
+ $question->correctfeedback['format'] = $question->questiontextformat;
+ $question->correctfeedback['files'] = array();
+ $question->partiallycorrectfeedback['text'] = '';
+ $question->partiallycorrectfeedback['format'] = $question->questiontextformat;
+ $question->partiallycorrectfeedback['files'] = array();
+ $question->incorrectfeedback['text'] = '';
+ $question->incorrectfeedback['format'] = $question->questiontextformat;
+ $question->incorrectfeedback['files'] = array();
+ return $question;
+ }
+
+ protected function parse_matching_groups($matching_groups) {
if (empty($matching_groups)) {
return;
}
- foreach($matching_groups as $match_group) {
- $newgroup = NULL;
+ foreach ($matching_groups as $match_group) {
+ $newgroup = new stdClass();
$groupname = trim($match_group['@']['name']);
$questiontext = $this->unxmlise($match_group['#']['text'][0]['#']);
$newgroup->questiontext = trim($questiontext);
$newgroup->subchoices = array();
$newgroup->subquestions = array();
$newgroup->subanswers = array();
$choices = $match_group['#']['choices']['0']['#'];
- foreach($choices as $key => $value) {
- if (strpos(trim($key),'choice-') !== FALSE) {
+ foreach ($choices as $key => $value) {
+ if (strpos(trim($key), 'choice-') !== false) {
$key = strtoupper(trim(str_replace('choice-', '', $key)));
$newgroup->subchoices[$key] = trim($value['0']['#']);
}
@@ -109,34 +131,35 @@ function parse_matching_groups($matching_groups)
}
}
- function parse_ma($qrec, $groupname)
- {
+ protected function parse_ma($qrec, $groupname) {
$match_group = $this->matching_questions[$groupname];
$phrase = trim($this->unxmlise($qrec['text']['0']['#']));
$answer = trim($this->unxmlise($qrec['answer']['0']['#']));
$answer = strip_tags( $answer );
$match_group->subquestions[] = $phrase;
$match_group->subanswers[] = $match_group->subchoices[$answer];
$this->matching_questions[$groupname] = $match_group;
- return NULL;
+ return null;
}
- function process_matches(&$questions)
- {
+ protected function process_matches(&$questions) {
if (empty($this->matching_questions)) {
return;
}
- foreach($this->matching_questions as $match_group) {
+ foreach ($this->matching_questions as $match_group) {
$question = $this->defaultquestion();
$htmltext = s($match_group->questiontext);
$question->questiontext = $htmltext;
- $question->name = $question->questiontext;
+ $question->questiontextformat = FORMAT_HTML;
+ $question->questiontextfiles = array();
+ $question->name = shorten_text( $question->questiontext, 250 );
$question->qtype = MATCH;
+ $question = $this->add_blank_combined_feedback($question);
$question->subquestions = array();
$question->subanswers = array();
- foreach($match_group->subquestions as $key => $value) {
+ foreach ($match_group->subquestions as $key => $value) {
$htmltext = s($value);
- $question->subquestions[] = $htmltext;
+ $question->subquestions[] = $this->text_field($htmltext);
$htmltext = s($match_group->subanswers[$key]);
$question->subanswers[] = $htmltext;
@@ -145,28 +168,28 @@ function process_matches(&$questions)
}
}
- function cleanUnicode($text) {
+ protected function cleanunicode($text) {
return str_replace('’', "'", $text);
}
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().
+ // Parses an array of lines into an array of questions,
+ // where each item is a question object as defined by
+ // readquestion().
$questions = array();
$currentquestion = array();
$text = implode($lines, ' ');
- $text = $this->cleanUnicode($text);
+ $text = $this->cleanunicode($text);
$xml = xmlize($text, 0);
if (!empty($xml['examview']['#']['matching-group'])) {
$this->parse_matching_groups($xml['examview']['#']['matching-group']);
}
- $questionNode = $xml['examview']['#']['question'];
- foreach($questionNode as $currentquestion) {
+ $questionnode = $xml['examview']['#']['question'];
+ foreach ($questionnode as $currentquestion) {
if ($question = $this->readquestion($currentquestion)) {
$questions[] = $question;
}
@@ -175,139 +198,136 @@ protected function readquestions($lines) {
$this->process_matches($questions);
return $questions;
}
- // end readquestions
- function readquestion($qrec)
- {
+ public function readquestion($qrec) {
$type = trim($qrec['@']['type']);
$question = $this->defaultquestion();
if (array_key_exists($type, $this->qtypes)) {
$question->qtype = $this->qtypes[$type];
- }
- else {
+ } else {
$question->qtype = null;
}
$question->single = 1;
- // Only one answer is allowed
+ // Only one answer is allowed.
$htmltext = $this->unxmlise($qrec['#']['text'][0]['#']);
$question->questiontext = $htmltext;
+ $question->questiontextformat = FORMAT_HTML;
+ $question->questiontextfiles = array();
$question->name = shorten_text( $question->questiontext, 250 );
switch ($question->qtype) {
- case MULTICHOICE:
- $question = $this->parse_mc($qrec['#'], $question);
- break;
- case MATCH:
- $groupname = trim($qrec['@']['group']);
- $question = $this->parse_ma($qrec['#'], $groupname);
- break;
- case TRUEFALSE:
- $question = $this->parse_tf_yn($qrec['#'], $question);
- break;
- case SHORTANSWER:
- $question = $this->parse_co($qrec['#'], $question);
- break;
- case ESSAY:
- $question = $this->parse_sa($qrec['#'], $question);
- break;
- case NUMERICAL:
- $question = $this->parse_nr($qrec['#'], $question);
- break;
- break;
+ case MULTICHOICE:
+ $question = $this->parse_mc($qrec['#'], $question);
+ break;
+ case MATCH:
+ $groupname = trim($qrec['@']['group']);
+ $question = $this->parse_ma($qrec['#'], $groupname);
+ break;
+ case TRUEFALSE:
+ $question = $this->parse_tf_yn($qrec['#'], $question);
+ break;
+ case SHORTANSWER:
+ $question = $this->parse_co($qrec['#'], $question);
+ break;
+ case ESSAY:
+ $question = $this->parse_es($qrec['#'], $question);
+ break;
+ case NUMERICAL:
+ $question = $this->parse_nr($qrec['#'], $question);
+ break;
+ break;
default:
- print("<p>Question type ".$type." import not supported for ".$question->questiontext."<p>");
- $question = NULL;
+ print("<p>Question type ".$type." import not supported for ".$question->questiontext."<p>");
+ $question = null;
}
- // end switch ($question->qtype)
return $question;
}
- // end readquestion
- function parse_tf_yn($qrec, $question)
- {
+ protected function parse_tf_yn($qrec, $question) {
$choices = array('T' => 1, 'Y' => 1, 'F' => 0, 'N' => 0 );
$answer = trim($qrec['answer'][0]['#']);
$question->answer = $choices[$answer];
$question->correctanswer = $question->answer;
if ($question->answer == 1) {
- $question->feedbacktrue = 'Correct';
- $question->feedbackfalse = 'Incorrect';
+ $question->feedbacktrue = $this->text_field('Correct');
+ $question->feedbackfalse = $this->text_field('Incorrect');
} else {
- $question->feedbacktrue = 'Incorrect';
- $question->feedbackfalse = 'Correct';
+ $question->feedbacktrue = $this->text_field('Incorrect');
+ $question->feedbackfalse = $this->text_field('Correct');
}
return $question;
}
- function parse_mc($qrec, $question)
- {
+ protected function parse_mc($qrec, $question) {
+ $question = $this->add_blank_combined_feedback($question);
$answer = 'choice-'.strtolower(trim($qrec['answer'][0]['#']));
$choices = $qrec['choices'][0]['#'];
- foreach($choices as $key => $value) {
- if (strpos(trim($key),'choice-') !== FALSE) {
+ foreach ($choices as $key => $value) {
+ if (strpos(trim($key), 'choice-') !== false) {
- $question->answer[$key] = s($this->unxmlise($value[0]['#']));
+ $question->answer[$key] = $this->text_field(s($this->unxmlise($value[0]['#'])));
if (strcmp($key, $answer) == 0) {
$question->fraction[$key] = 1;
- $question->feedback[$key] = 'Correct';
+ $question->feedback[$key] = $this->text_field('Correct');
} else {
$question->fraction[$key] = 0;
- $question->feedback[$key] = 'Incorrect';
+ $question->feedback[$key] = $this->text_field('Incorrect');
}
}
}
return $question;
}
- function parse_co($qrec, $question)
- {
+ protected function parse_co($qrec, $question) {
$question->usecase = 0;
$answer = trim($this->unxmlise($qrec['answer'][0]['#']));
$answer = strip_tags( $answer );
- $answers = explode("\n",$answer);
+ $answers = explode("\n", $answer);
- foreach($answers as $key => $value) {
+ foreach ($answers as $key => $value) {
$value = trim($value);
if (strlen($value) > 0) {
$question->answer[$key] = $value;
$question->fraction[$key] = 1;
- $question->feedback[$key] = "Correct";
+ $question->feedback[$key] = $this->text_field("Correct");
}
}
return $question;
}
- function parse_sa($qrec, $question) {
+ protected function parse_es($qrec, $question) {
$feedback = trim($this->unxmlise($qrec['answer'][0]['#']));
+ $question->graderinfo = $this->text_field($feedback);
$question->feedback = $feedback;
+ $question->responseformat = 'editor';
+ $question->responsefieldlines = 15;
+ $question->attachments = 0;
$question->fraction = 0;
return $question;
}
- function parse_nr($qrec, $question)
- {
+ protected function parse_nr($qrec, $question) {
$answer = trim($this->unxmlise($qrec['answer'][0]['#']));
$answer = strip_tags( $answer );
- $answers = explode("\n",$answer);
+ $answers = explode("\n", $answer);
- foreach($answers as $key => $value) {
+ foreach ($answers as $key => $value) {
$value = trim($value);
if (is_numeric($value)) {
$errormargin = 0;
$question->answer[$key] = $value;
$question->fraction[$key] = 1;
- $question->feedback[$key] = "Correct";
- $question->min[$key] = $question->answer[$key] - $errormargin;
- $question->max[$key] = $question->answer[$key] + $errormargin;
+ $question->feedback[$key] = $this->text_field("Correct");
+ $question->tolerance[$key] = $errormargin;
}
}
return $question;
}
}
-// end class
+// End class.
View
164 question/format/examview/tests/fixtures/questions.examview.xml
@@ -0,0 +1,164 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes'?>
+<examview type='test' platform='Windows' app-version='4.0.2'>
+ <header>
+ <title>Moodle Example</title>
+ <version>A</version>
+ </header>
+ <font-table>
+ <font-entry number='1'>
+ <charset>ansi</charset>
+ <name>Times New Roman</name>
+ <pitch>variable</pitch>
+ <family>roman</family>
+ </font-entry>
+ </font-table>
+ <preferences>
+ <show>
+ <show-answer value='yes'/>
+ <show-difficulty value='yes'/>
+ <show-reference value='yes'/>
+ <show-text-objective value='yes'/>
+ <show-state-objective value='yes'/>
+ <show-topic value='yes'/>
+ <show-keywords value='yes'/>
+ <show-misc value='yes'/>
+ <show-notes value='yes'/>
+ <show-rationale value='yes'/>
+ </show>
+ <leave-answer-space>
+ <tf value='yes'/>
+ <mtf value='yes'/>
+ <mc value='yes'/>
+ <yn value='yes'/>
+ <nr value='no'/>
+ <co value='no'/>
+ <ma value='yes'/>
+ <sa value='no'/>
+ <pr value='no'/>
+ <es value='no'/>
+ <ca value='no'/>
+ <ot value='no'/>
+ </leave-answer-space>
+ <question-type-order value='tf,mtf,mc,yn,nr,co,ma,sa,pr,es,ca,ot'/>
+ <section-page-break value='no'/>
+ <bi-display-mode value='mc'/>
+ <tf-show-choices value='no'/>
+ <mc-conserve-paper value='no'/>
+ <mc-choice-sequence value='abcde'/>
+ <show-answer-lines value='no'/>
+ <question-numbering value='continuous'/>
+ <answer-style template='a.' style='none'/>
+ <number-style template='1.' style='none'/>
+ <max-question-id value='9'/>
+ <max-narrative-id value='0'/>
+ <max-group-id value='1'/>
+ <default-font target='title'>
+ <number>1</number>
+ <size>13</size>
+ <style>bold</style>
+ <text-rgb>#000000</text-rgb>
+ </default-font>
+ <default-font target='sectiontitle'>
+ <number>1</number>
+ <size>11</size>
+ <style>bold</style>
+ <text-rgb>#000000</text-rgb>
+ </default-font>
+ <default-font target='questionnumber'>
+ <number>1</number>
+ <size>11</size>
+ <text-rgb>#000000</text-rgb>
+ </default-font>
+ <default-font target='answerchoice'>
+ <number>1</number>
+ <size>11</size>
+ <text-rgb>#000000</text-rgb>
+ </default-font>
+ <default-font target='newquestiondefault'>
+ <number>1</number>
+ <size>11</size>
+ <text-rgb>#000000</text-rgb>
+ </default-font>
+ </preferences>
+ <test-header page='first'><para tabs='R10440'><b>Name: ________________________ Class: ___________________ Date: __________ ID: <field field-type='version'/></b></para></test-header>
+ <test-header page='subsequent'><para tabs='R10440'><b>Name: ________________________ ID: <field field-type='version'/></b></para></test-header>
+ <test-footer page='first'><para justify='center'><field field-type='pageNumber'/>
+</para></test-footer>
+ <test-footer page='subsequent'><para justify='center'><field field-type='pageNumber'/>
+</para></test-footer>
+ <instruction type='tf'><b>True/False</b><font size='10'>
+</font><i>Indicate whether the sentence or statement is true or false.</i></instruction>
+ <instruction type='mtf'><b>Modified True/False</b><font size='10'>
+</font><i>Indicate whether the sentence or statement is true or false. If false, change the identified word or phrase to make the sentence or statement true.</i></instruction>
+ <instruction type='mc'><b>Multiple Choice</b><font size='10'>
+</font><i>Identify the letter of the choice that best completes the statement or answers the question.</i></instruction>
+ <instruction type='yn'><b>Yes/No</b><font size='10'>
+</font><i>Indicate whether you agree with the sentence or statement.</i></instruction>
+ <instruction type='nr'><b>Numeric Response</b></instruction>
+ <instruction type='co'><b>Completion</b><font size='10'>
+</font><i>Complete each sentence or statement.</i></instruction>
+ <instruction type='ma'><b>Matching</b></instruction>
+ <instruction type='sa'><b>Short Answer</b></instruction>
+ <instruction type='pr'><b>Problem</b></instruction>
+ <instruction type='es'><b>Essay</b></instruction>
+ <instruction type='ca'><b>Case</b></instruction>
+ <instruction type='ot'><b>Other</b></instruction>
+ <question type='tf' question-id='1' bank-id='0'>
+ <text>This is a T/F question. Tim and Jean-Michael are great people.</text>
+ <rationale>Examview allows for this &#x201c;Rationale&#x201d; field</rationale>
+ <answer>T</answer>
+ </question>
+ <question type='mc' question-id='2' bank-id='0'>
+ <text>This is an example of a multiple choice question. This is only an ________</text>
+ <choices columns='2'>
+ <choice-a>example</choice-a>
+ <choice-b>the real thing</choice-b>
+ <choice-c>a true false question</choice-c>
+ <choice-d>none of these</choice-d>
+ </choices>
+ <answer>A</answer>
+ </question>
+ <question type='nr' question-id='3' bank-id='0'>
+ <text>This is a numeric response question. How much is 12 * 2?</text>
+ <answer>24</answer>
+ <info>
+ <answer-space>-1</answer-space>
+ </info>
+ </question>
+ <matching-group group-id='1' bank-id='0' name='Matching 1'>
+ <text>This is a matching question type.
+</text>
+ <choices columns='2'>
+ <choice-a>Question 1</choice-a>
+ <choice-b>Question 2</choice-b>
+ <choice-c>Question 3</choice-c>
+ <choice-d>Question 4</choice-d>
+ </choices>
+ </matching-group>
+ <question type='ma' question-id='6' bank-id='0' group='Matching 1'>
+ <text>This is question 1.</text>
+ <answer>A</answer>
+ </question>
+ <question type='ma' question-id='7' bank-id='0' group='Matching 1'>
+ <text>This is question 2.</text>
+ <answer>B</answer>
+ </question>
+ <question type='ma' question-id='8' bank-id='0' group='Matching 1'>
+ <text>This is question 3.</text>
+ <answer>C</answer>
+ </question>
+ <question type='sa' question-id='5' bank-id='0'>
+ <text>This is a short answer question. This is a ___________ answer question.</text>
+ <answer>short</answer>
+ <info>
+ <answer-space>-1</answer-space>
+ </info>
+ </question>
+ <question type='es' question-id='4' bank-id='0'>
+ <text>This is an essay question. I am not sure if an answer is needed.</text>
+ <answer>This is the answer in Examview. I am curious to see how this shows in Moodle.</answer>
+ <info>
+ <answer-space>-1</answer-space>
+ </info>
+ </question>
+</examview>

0 comments on commit c04ddf2

Please sign in to comment.