Skip to content
Browse files

Various improvements to Examview import.

Fixes MDL-7087 and MDL-7349. Fixes Examview part in MDL-7184
  • Loading branch information...
1 parent ef10728 commit 54ccc96b58b5dd2edbe0dc05ef3f7dad9290c5ed thepurpleblob committed Nov 20, 2006
Showing with 41 additions and 63 deletions.
  1. +41 −63 question/format/examview/format.php
View
104 question/format/examview/format.php
@@ -11,6 +11,10 @@
** Support of rejoinders
**
** $Log$
+** Revision 1.2.2.4 2006/11/20 12:57:04 thepurpleblob
+** Various improvements to Examview import.
+** Fixes MDL-7087 and MDL-7349. Fixes Examview part in MDL-7184
+**
** Revision 1.2.2.3 2006/10/30 16:19:32 thepurpleblob
** Whoops - left some debugging stuff in place.
**
@@ -78,26 +82,31 @@ function provide_import() {
return true;
}
- function print_matching_questions()
- {
- foreach($this->matching_questions as $key => $value) {
- print("$key => $value->questiontext<BR>");
- print("Questions:<UL>");
- foreach($value->subquestions as $qkey => $qvalue) {
- print("<LI>$qkey => $qvalue</LI>");
- }
- print("</UL>");
- print("Choices:<UL>");
- foreach($value->subchoices as $ckey => $cvalue) {
- print("<LI>$ckey => $cvalue</LI>");
- }
- print("</UL>");
- print("Answers:<UL>");
- foreach($value->subanswers as $akey => $avalue) {
- print("<LI>$akey => $avalue</LI>");
+ /**
+ * 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
+ if (!is_array($xml)) {
+ $text = s(addslashes($xml));
+ }
+ else {
+ // otherwise parse the array
+ $text = '';
+ foreach ($xml as $tag=>$data) {
+ // if tag is '@' then it's attributes and we don't care
+ if ($tag!=='@') {
+ $text = $text . $this->unxmlise( $data );
+ }
}
- print("</UL>");
}
+
+ // currently we throw the tags we found
+ $text = strip_tags($text);
+ return $text;
}
function parse_matching_groups($matching_groups)
@@ -108,7 +117,7 @@ function parse_matching_groups($matching_groups)
foreach($matching_groups as $match_group) {
$newgroup = NULL;
$groupname = trim($match_group['@']['name']);
- $questiontext = $this->ArrayTagToString($match_group['#']['text']['0']['#']);
+ $questiontext = $this->unxmlise($match_group['#']['text'][0]['#']);
$newgroup->questiontext = trim($questiontext);
$newgroup->subchoices = array();
$newgroup->subquestions = array();
@@ -127,8 +136,9 @@ function parse_matching_groups($matching_groups)
function parse_ma($qrec, $groupname)
{
$match_group = $this->matching_questions[$groupname];
- $phrase = trim($qrec['text']['0']['#']);
- $answer = trim($qrec['answer']['0']['#']);
+ $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;
@@ -142,20 +152,17 @@ function process_matches(&$questions)
}
foreach($this->matching_questions as $match_group) {
$question = $this->defaultquestion();
- $htmltext = $this->htmlPrepare($match_group->questiontext);
- $htmltext = addslashes($htmltext);
+ $htmltext = $this->s(addslashes($match_group->questiontext));
$question->questiontext = $htmltext;
$question->name = $question->questiontext;
$question->qtype = MATCH;
$question->subquestions = array();
$question->subanswers = array();
foreach($match_group->subquestions as $key => $value) {
- $htmltext = $this->htmlPrepare($value);
- $htmltext = addslashes($htmltext);
+ $htmltext = s(addslashes($value));
$question->subquestions[] = $htmltext;
- $htmltext = $this->htmlPrepare($match_group->subanswers[$key]);
- $htmltext = addslashes($htmltext);
+ $htmltext = $this->s(addslashes($match_group->subanswers[$key]));
$question->subanswers[] = $htmltext;
}
$questions[] = $question;
@@ -191,40 +198,11 @@ function readquestions($lines) {
}
}
- // print('<hr>');
- // $this->print_matching_questions();
$this->process_matches($questions);
- // print('<hr>');
-
return $questions;
}
// end readquestions
- function htmlPrepare($htmltext)
- {
- // $text = trim($text);
- $text = s($htmltext);
- //$htmltext = nl2br($text);
- return $text;
- }
-
- function ArrayTagToString($aTag)
- {
- if (!is_array($aTag)) {
- return $aTag;
- }
- $out = '';
- foreach($aTag as $key => $value) {
- if (is_array($value)) {
- $out = $out.$this->ArrayTagToString($value);
- } else {
- $out = $value;
- }
- }
- return $out;
- }
-
-
function readquestion($qrec)
{
@@ -233,9 +211,7 @@ function readquestion($qrec)
$question->qtype = $this->qtypes[$type];
$question->single = 1;
// Only one answer is allowed
- $htmltext = $this->ArrayTagToString($qrec['#']['text'][0]['#']);
- $htmltext = $this->htmlPrepare($htmltext);
- $htmltext = addslashes($htmltext);
+ $htmltext = $this->unxmlise($qrec['#']['text'][0]['#']);
$question->questiontext = $htmltext;
$question->name = $question->questiontext;
@@ -289,8 +265,8 @@ function parse_mc($qrec, $question)
$choices = $qrec['choices'][0]['#'];
foreach($choices as $key => $value) {
if (strpos(trim($key),'choice-') !== FALSE) {
-
- $question->answer[$key] = $this->htmlPrepare($value[0]['#']);
+
+ $question->answer[$key] = s($this->unxmlise($value[0]['#']));
if (strcmp($key, $answer) == 0) {
$question->fraction[$key] = 1;
$question->feedback[$key] = 'Correct';
@@ -306,7 +282,8 @@ function parse_mc($qrec, $question)
function parse_co($qrec, $question)
{
$question->usecase = 0;
- $answer = trim($qrec['answer'][0]['#']);
+ $answer = trim($this->unxmlise($qrec['answer'][0]['#']));
+ $answer = strip_tags( $answer );
$answers = explode("\n",$answer);
foreach($answers as $key => $value) {
@@ -322,7 +299,8 @@ function parse_co($qrec, $question)
function parse_nr($qrec, $question)
{
- $answer = trim($qrec['answer'][0]['#']);
+ $answer = trim($this->unxmlise($qrec['answer'][0]['#']));
+ $answer = strip_tags( $answer );
$answers = explode("\n",$answer);
foreach($answers as $key => $value) {

0 comments on commit 54ccc96

Please sign in to comment.
Something went wrong with that request. Please try again.