]> git.mjollnir.org Git - moodle.git/commitdiff
MDL-15885
authorthepurpleblob <thepurpleblob>
Mon, 4 Aug 2008 10:20:51 +0000 (10:20 +0000)
committerthepurpleblob <thepurpleblob>
Mon, 4 Aug 2008 10:20:51 +0000 (10:20 +0000)
QTI fixes from Niall Barr

Merged from STABLE_19

question/format/qti_two/format.php
question/format/qti_two/templates/choiceMultiple.tpl

index d516714fc78b20db9f1faa39c8a31579f4cb431c..cd6832e27e2989b3afb1f8d99017e0df685368a4 100644 (file)
@@ -1,6 +1,6 @@
 <?php  // $Id$
 
-require_once("$CFG->dirroot/question/format/qti_two/qt_common.php");
+require_once("$CFG->dirroot/question/format/qti2/qt_common.php");
 ////////////////////////////////////////////////////////////////////////////
 /// IMS QTI 2.0 FORMAT
 ///
@@ -14,126 +14,128 @@ require_once("$CFG->dirroot/question/format/qti_two/qt_common.php");
  */
 define('CLOZE_TRAILING_TEXT_ID', 9999999);
 
-class qformat_qti_two extends qformat_default {
-    
+class qformat_qti2 extends qformat_default {
+
     var $lang;
 
     function provide_export() {
        return true;
     }
-    
-    function indent_xhtml($source, $indenter = ' ') { 
+
+    function indent_xhtml($source, $indenter = ' ') {
         // xml tidier-upper
         // (c) Ari Koivula http://ventionline.com
-        
-        // Remove all pre-existing formatting. 
-        // Remove all newlines. 
-        $source = str_replace("\n", '', $source); 
-        $source = str_replace("\r", '', $source); 
-        // Remove all tabs. 
-        $source = str_replace("\t", '', $source); 
-        // Remove all space after ">" and before "<". 
-        $source = ereg_replace(">( )*", ">", $source); 
-        $source = ereg_replace("( )*<", "<", $source); 
-    
-        // Iterate through the source. 
-        $level = 0; 
-        $source_len = strlen($source); 
-        $pt = 0; 
-        while ($pt < $source_len) { 
-            if ($source{$pt} === '<') { 
-                // We have entered a tag. 
-                // Remember the point where the tag starts. 
-                $started_at = $pt; 
-                $tag_level = 1; 
-                // If the second letter of the tag is "/", assume its an ending tag. 
-                if ($source{$pt+1} === '/') { 
-                    $tag_level = -1; 
-                } 
-                // If the second letter of the tag is "!", assume its an "invisible" tag. 
-                if ($source{$pt+1} === '!') { 
-                    $tag_level = 0; 
-                } 
-                // Iterate throught the source until the end of tag. 
-                while ($source{$pt} !== '>') { 
-                    $pt++; 
-                } 
-                // If the second last letter is "/", assume its a self ending tag. 
-                if ($source{$pt-1} === '/') { 
-                    $tag_level = 0; 
-                } 
-                $tag_lenght = $pt+1-$started_at; 
-                 
-                // Decide the level of indention for this tag. 
-                // If this was an ending tag, decrease indent level for this tag.. 
-                if ($tag_level === -1) { 
-                    $level--; 
-                } 
-                // Place the tag in an array with proper indention. 
-                $array[] = str_repeat($indenter, $level).substr($source, $started_at, $tag_lenght); 
-                // If this was a starting tag, increase the indent level after this tag. 
-                if ($tag_level === 1) { 
-                    $level++; 
-                } 
-                // if it was a self closing tag, dont do shit. 
-            } 
-            // Were out of the tag. 
-            // If next letter exists... 
-            if (($pt+1) < $source_len) { 
-                // ... and its not an "<". 
-                if ($source{$pt+1} !== '<') { 
-                    $started_at = $pt+1; 
-                    // Iterate through the source until the start of new tag or until we reach the end of file. 
-                    while ($source{$pt} !== '<' && $pt < $source_len) { 
-                        $pt++; 
-                    } 
-                    // If we found a "<" (we didnt find the end of file) 
-                    if ($source{$pt} === '<') { 
-                        $tag_lenght = $pt-$started_at; 
-                        // Place the stuff in an array with proper indention. 
-                        $array[] = str_repeat($indenter, $level).substr($source, $started_at, $tag_lenght); 
-                    } 
-                // If the next tag is "<", just advance pointer and let the tag indenter take care of it. 
-                } else { 
-                    $pt++; 
-                } 
-            // If the next letter doesnt exist... Were done... well, almost.. 
-            } else { 
-                break; 
-            } 
-        } 
-        // Replace old source with the new one we just collected into our array. 
-        $source = implode($array, "\n"); 
-        return $source; 
-    } 
-    
+
+        // Remove all pre-existing formatting.
+        // Remove all newlines.
+        $source = str_replace("\n", '', $source);
+        $source = str_replace("\r", '', $source);
+        // Remove all tabs.
+        $source = str_replace("\t", '', $source);
+        // Remove all space after ">" and before "<".
+        $source = ereg_replace(">( )*", ">", $source);
+        $source = ereg_replace("( )*<", "<", $source);
+
+        // Iterate through the source.
+        $level = 0;
+        $source_len = strlen($source);
+        $pt = 0;
+        while ($pt < $source_len) {
+            if ($source{$pt} === '<') {
+                // We have entered a tag.
+                // Remember the point where the tag starts.
+                $started_at = $pt;
+                $tag_level = 1;
+                // If the second letter of the tag is "/", assume its an ending tag.
+                if ($source{$pt+1} === '/') {
+                    $tag_level = -1;
+                }
+                // If the second letter of the tag is "!", assume its an "invisible" tag.
+                if ($source{$pt+1} === '!') {
+                    $tag_level = 0;
+                }
+                // Iterate throught the source until the end of tag.
+                while ($source{$pt} !== '>') {
+                    $pt++;
+                }
+                // If the second last letter is "/", assume its a self ending tag.
+                if ($source{$pt-1} === '/') {
+                    $tag_level = 0;
+                }
+                $tag_lenght = $pt+1-$started_at;
+
+                // Decide the level of indention for this tag.
+                // If this was an ending tag, decrease indent level for this tag..
+                if ($tag_level === -1) {
+                    $level--;
+                }
+                // Place the tag in an array with proper indention.
+                $array[] = str_repeat($indenter, $level).substr($source, $started_at, $tag_lenght);
+                // If this was a starting tag, increase the indent level after this tag.
+                if ($tag_level === 1) {
+                    $level++;
+                }
+                // if it was a self closing tag, dont do shit.
+            }
+            // Were out of the tag.
+            // If next letter exists...
+            if (($pt+1) < $source_len) {
+                // ... and its not an "<".
+                if ($source{$pt+1} !== '<') {
+                    $started_at = $pt+1;
+                    // Iterate through the source until the start of new tag or until we reach the end of file.
+                    while ($source{$pt} !== '<' && $pt < $source_len) {
+                        $pt++;
+                    }
+                    // If we found a "<" (we didnt find the end of file)
+                    if ($source{$pt} === '<') {
+                        $tag_lenght = $pt-$started_at;
+                        // Place the stuff in an array with proper indention.
+                        $array[] = str_repeat($indenter, $level).substr($source, $started_at, $tag_lenght);
+                    }
+                // If the next tag is "<", just advance pointer and let the tag indenter take care of it.
+                } else {
+                    $pt++;
+                }
+            // If the next letter doesnt exist... Were done... well, almost..
+            } else {
+                break;
+            }
+        }
+        // Replace old source with the new one we just collected into our array.
+        $source = implode($array, "\n");
+        return $source;
+    }
+
     function importpreprocess() {
         global $CFG;
-        print_error('cannotimportformat', 'question', "$CFG->wwwroot/mod/quiz/import.php?category=$category->id");
+
+        error("Sorry, importing this format is not yet implemented!",
+            "$CFG->wwwroot/mod/quiz/import.php?category=$category->id");
     }
 
     function exportpreprocess() {
         global $CFG;
-        
+
         require_once("{$CFG->libdir}/smarty/Smarty.class.php");
-        
+
         // assign the language for the export: by parameter, SESSION, USER, or the default of 'en'
         $lang = current_language();
         $this->lang = $lang;
-        
+
         return parent::exportpreprocess();
     }
-    
-    
+
+
     function export_file_extension() {
         // override default type so extension is .xml
-        
+
         return ".zip";
     }
-    
+
     function get_qtype( $type_id ) {
         // translates question type code number into actual name
-       
+
         switch( $type_id ) {
         case TRUEFALSE:
             $name = 'truefalse';
@@ -163,15 +165,15 @@ class qformat_qti_two extends qformat_default {
     }
 
     function writetext( $raw ) {
-        // generates <text></text> tags, processing raw text therein 
-    
-        // for now, don't allow any additional tags in text 
+        // generates <text></text> tags, processing raw text therein
+
+        // for now, don't allow any additional tags in text
         // otherwise xml rules would probably get broken
         $raw = strip_tags( $raw );
-    
+
         return "<text>$raw</text>\n";
     }
-    
+
 
 /**
  * flattens $object['media'], copies $object['media'] to $path, and sets $object['mediamimetype']
@@ -180,7 +182,7 @@ class qformat_qti_two extends qformat_default {
  * @param string $path the full path name to where the media files need to be copied
  * @param int $courseid
  * @return: mixed - true on success or in case of an empty media field, an error string if the file copy fails
- */    
+ */
 function copy_and_flatten(&$object, $path, $courseid) {
     global $CFG;
     if (!empty($object['media'])) {
@@ -194,7 +196,7 @@ function copy_and_flatten(&$object, $path, $courseid) {
         }
     }
     return true;
-} 
+}
 /**
  * copies all files needed by the questions to the given $path, and flattens the file names
  *
@@ -202,12 +204,12 @@ function copy_and_flatten(&$object, $path, $courseid) {
  * @param string $path the full path name to where the media files need to be copied
  * @param int $courseid
  * @return mixed true on success, an array of error messages otherwise
- */    
+ */
 function handle_questions_media(&$questions, $path, $courseid) {
     global $CFG;
     $errors = array();
     foreach ($questions as $key=>$question) {
-        
+
     // todo: handle in-line media (specified in the question text)
         if (!empty($question->image)) {
             $location = $questions[$key]->image;
@@ -220,7 +222,7 @@ function handle_questions_media(&$questions, $path, $courseid) {
             }
         }
     }
-    
+
     return empty($errors) ? true : $errors;
 }
 
@@ -231,7 +233,7 @@ function handle_questions_media(&$questions, $path, $courseid) {
  *
  * @param string $filename the directory name which will hold the exported files
  * @return boolean - or errors out
- */    
+ */
     function exportprocess() {
 
         global $CFG;
@@ -239,27 +241,26 @@ function handle_questions_media(&$questions, $path, $courseid) {
 
         // create a directory for the exports (if not already existing)
         if (!$export_dir = make_upload_directory($this->question_get_export_dir().'/'.$this->filename)) {
-            print_error('cannotcreatepath', 'quiz', '', $export_dir);
+              error( get_string('cannotcreatepath','quiz',$export_dir) );
         }
         $path = $CFG->dataroot.'/'.$this->question_get_export_dir().'/'.$this->filename;
 
         // get the questions (from database) in this category
         // $questions = get_records("question","category",$this->category->id);
         $questions = get_questions_category( $this->category );
-        
+
         notify("Exporting ".count($questions)." questions.");
         $count = 0;
 
         // create the imsmanifest file
         $smarty =& $this->init_smarty();
         $this->add_qti_info($questions);
-        
         // copy files used by the main questions to the export directory
         $result = $this->handle_questions_media($questions, $path, $courseid);
         if ($result !== true) {
             notify(implode("<br />", $result));
         }
-       
+
         $manifestquestions = $this->objects_to_array($questions);
         $manifestid = str_replace(array(':', '/'), array('-','_'), "question_category_{$this->category->id}---{$CFG->wwwroot}");
         $smarty->assign('externalfiles', 1);
@@ -272,34 +273,34 @@ function handle_questions_media(&$questions, $path, $courseid) {
         $expout = $smarty->fetch('imsmanifest.tpl');
         $filepath = $path.'/imsmanifest.xml';
         if (empty($expout)) {
-            print_error('emptyxml', 'question');
+            error("Unkown error - empty imsmanifest.xml");
         }
         if (!$fh=fopen($filepath,"w")) {
-            print_error('cannotwriteto', 'question', '', $filepath);
+            error("Cannot open for writing: $filepath");
         }
         if (!fwrite($fh, $expout)) {
-            print_error('cannotwriteto', 'question', '', $filepath);
+            error("Cannot write exported questions to $filepath");
         }
         fclose($fh);
 
         // iterate through questions
         foreach($questions as $question) {
-            
+
             // results are first written into string (and then to a file)
             $count++;
-            echo "<hr /><p><b>$count</b>. ".$question->questiontext."</p>";
+            echo "<hr /><p><b>$count</b>. ".stripslashes($question->questiontext)."</p>";
             $expout = $this->writequestion( $question , null, true, $path) . "\n";
             $expout = $this->presave_process( $expout );
-            
+
             $filepath = $path.'/'.$this->get_assesment_item_id($question) . ".xml";
             if (!$fh=fopen($filepath,"w")) {
-                print_error('cannotwriteto', 'question', '', $filepath);
+                error("Cannot open for writing: $filepath");
             }
             if (!fwrite($fh, $expout)) {
-                print_error('cannotwriteto', 'question', '', $filepath);
+                error("Cannot write exported questions to $filepath");
             }
             fclose($fh);
-            
+
         }
 
         // zip files into single export file
@@ -307,10 +308,10 @@ function handle_questions_media(&$questions, $path, $courseid) {
 
         // remove the temporary directory
         remove_dir( $path );
+
         return true;
     }
-    
+
 /**
  * exports a quiz (as opposed to exporting a category of questions)
  *
@@ -322,7 +323,7 @@ function handle_questions_media(&$questions, $path, $courseid) {
  * @param string $redirect - a URL to redirect to in case of failure
  * @param string $submiturl - the URL for the qti player to send the results to (e.g. attempt.php)
  * @todo use $result in the ouput
- */    
+ */
      function export_quiz($course, $quiz, $questions, $result, $redirect, $submiturl = null) {
         $this->xml_entitize($course);
         $this->xml_entitize($quiz);
@@ -330,17 +331,17 @@ function handle_questions_media(&$questions, $path, $courseid) {
         $this->xml_entitize($result);
         $this->xml_entitize($submiturl);
         if (! $this->exportpreprocess(0, $course)) {   // Do anything before that we need to
-            print_error('errorduringpre', 'question', $redirect);
+            error("Error occurred during pre-processing!", $redirect);
         }
         if (! $this->exportprocess_quiz($quiz, $questions, $result, $submiturl, $course)) {         // Process the export data
-            print_error('errorduringproc', 'question', $redirect);
+            error("Error occurred during processing!", $redirect);
         }
         if (! $this->exportpostprocess()) {                    // In case anything needs to be done after
-            print_error('errorduringpost', 'question', $redirect);
+            error("Error occurred during post-processing!", $redirect);
         }
 
     }
-    
+
 
 /**
  * This function is called to export a quiz (as opposed to exporting a category of questions)
@@ -350,7 +351,7 @@ function handle_questions_media(&$questions, $path, $courseid) {
  * @param array $questions - an array of question objects
  * @param object $result - if set, contains result of calling quiz_grade_responses()
  * @todo use $result in the ouput
- */    
+ */
     function exportprocess_quiz($quiz, $questions, $result, $submiturl, $course) {
         global $USER;
         global $CFG;
@@ -364,12 +365,12 @@ function handle_questions_media(&$questions, $path, $courseid) {
 
         $smarty =& $this->init_smarty();
         $smarty->assign('questions', $questions);
-        
+
         // quiz level smarty variables
         $manifestid = str_replace(array(':', '/'), array('-','_'), "quiz{$quiz->id}-{$CFG->wwwroot}");
         $smarty->assign('manifestidentifier', $manifestid);
         $smarty->assign('submiturl', $submiturl);
-        $smarty->assign('userid', $USER->id);        
+        $smarty->assign('userid', $USER->id);
         $smarty->assign('username', htmlspecialchars($USER->username, ENT_COMPAT, 'UTF-8'));
         $smarty->assign('quiz_level_export', 1);
         $smarty->assign('quiztitle', format_string($quiz->name,true)); //assigned specifically so as not to cause problems with category-level export
@@ -384,8 +385,8 @@ function handle_questions_media(&$questions, $path, $courseid) {
         return true;
     }
 
-    
-    
+
+
 
 /**
  * Prepares questions for quiz export
@@ -399,7 +400,7 @@ function handle_questions_media(&$questions, $path, $courseid) {
  * @param array $questions - an array of question objects
  * @param int $quizid
  * @return an array of question arrays
- */    
+ */
     function quiz_export_prepare_questions($questions, $quizid, $courseid, $shuffleanswers = null) {
         global $CFG;
         // add the answers to the questions and format the image property
@@ -407,13 +408,13 @@ function handle_questions_media(&$questions, $path, $courseid) {
             $questions[$key] = get_question_data($question);
             $questions[$key]->courseid = $courseid;
             $questions[$key]->quizid = $quizid;
-    
+
             if ($question->image) {
-                
+
                 if (empty($question->mediamimetype)) {
-                  $questions[$key]->mediamimetype = mimeinfo('type',$question->image);  
+                  $questions[$key]->mediamimetype = mimeinfo('type',$question->image);
                 }
-                
+
                 $localfile = (substr(strtolower($question->image), 0, 7) == 'http://') ? false : true;
 
                 if ($localfile) {
@@ -422,7 +423,7 @@ function handle_questions_media(&$questions, $path, $courseid) {
                         $questions[$key]->mediaurl = "$CFG->wwwroot/file.php/$question->image";
                     } else {
                         $questions[$key]->mediaurl = "$CFG->wwwroot/file.php?file=$question->image";
-                    } 
+                    }
                 } else {
                     $questions[$key]->mediaurl = $question->image;
                 }
@@ -437,11 +438,11 @@ function handle_questions_media(&$questions, $path, $courseid) {
 
 /**
  * calls htmlspecialchars for each string field, to convert, for example, & to &amp;
- * 
+ *
  * collections are processed recursively
  *
  * @param array $collection - an array or object or string
- */    
+ */
 function xml_entitize(&$collection) {
     if (is_array($collection)) {
         foreach ($collection as $key=>$var) {
@@ -449,7 +450,7 @@ function xml_entitize(&$collection) {
                 $collection[$key]= htmlspecialchars($var, ENT_COMPAT, 'UTF-8');
             } else if (is_array($var) || is_object($var)) {
                 $this->xml_entitize($collection[$key]);
-            } 
+            }
         }
     } else if (is_object($collection)) {
         $vars = get_object_vars($collection);
@@ -458,13 +459,13 @@ function xml_entitize(&$collection) {
                 $collection->$key = htmlspecialchars($var, ENT_COMPAT, 'UTF-8');
             } else if (is_array($var) || is_object($var)) {
                 $this->xml_entitize($collection->$key);
-            } 
+            }
         }
     } else if (is_string($collection)) {
         $collection = htmlspecialchars($collection, ENT_COMPAT, 'UTF-8');
     }
 }
+
 /**
  * adds exporttext property to the questions
  *
@@ -472,7 +473,7 @@ function xml_entitize(&$collection) {
  *
  * @param array $questions - an array of question objects
  * @return an array of question objects
- */    
+ */
     function questions_with_export_info($questions, $shuffleanswers = null) {
         $exportquestions = array();
         foreach($questions as $key=>$question) {
@@ -494,19 +495,19 @@ function xml_entitize(&$collection) {
  * @param boolean $courselevel whether or not this is a course-level export
  * @param string $path provide the path to copy question media files to, if $courselevel == true
  * @return string containing export text
- */    
+ */
     function writequestion($question, $shuffleanswers = null, $courselevel = false, $path = '') {
         // turns question into string
         // question reflects database fields for general question and specific to type
         global $CFG;
         $expout = '';
-        //need to unencode the html entities in the questiontext field.  
+        //need to unencode the html entities in the questiontext field.
         // the whole question object was earlier run throught htmlspecialchars in xml_entitize().
         $question->questiontext = html_entity_decode($question->questiontext, ENT_COMPAT);
-        
+
         $hasimage = empty($question->image) ? 0 : 1;
         $hassize = empty($question->mediax) ? 0 : 1;
-        
+
         $allowedtags = '<a><br><b><h1><h2><h3><h4><i><img><li><ol><strong><table><tr><td><th><u><ul><object>';  // all other tags will be stripped from question text
         $smarty =& $this->init_smarty();
         $assesmentitemid = $this->get_assesment_item_id($question);
@@ -518,19 +519,19 @@ function xml_entitize(&$collection) {
         $smarty->assign('assessmentitemidentifier', $assesmentitemid);
         $smarty->assign('assessmentitemtitle', $question->name);
         $smarty->assign('courselevelexport', $courselevel);
-        
+
         if ($question->qtype == MULTIANSWER) {
             $question->questiontext = strip_tags($question->questiontext, $allowedtags . '<intro>');
             $smarty->assign('questionText',  $this->get_cloze_intro($question->questiontext));
         } else {
             $smarty->assign('questionText',  strip_tags($question->questiontext, $allowedtags));
         }
-        
+
         $smarty->assign('question', $question);
         // the following two are left for compatibility; the templates should be changed, though, to make object tags for the questions
         //$smarty->assign('questionimage', $question->image);
         //$smarty->assign('questionimagealt', "image: $question->image");
-        
+
         // output depends on question type
         switch($question->qtype) {
         case TRUEFALSE:
@@ -539,12 +540,12 @@ function xml_entitize(&$collection) {
             $answers[0]['answer'] = get_string("true", "quiz");
             $answers[1] = (array)$qanswers['false'];
             $answers[1]['answer'] = get_string("false", "quiz");
-            
+
             if (!empty($shuffleanswers)) {
                 $answers = $this->shuffle_things($answers);
             }
-            
-        if (isset($question->response)) {
+
+            if (isset($question->response)) {
               $correctresponseid = $question->response[$questionid];
               if ($answers[0]['id'] == $correctresponseid) {
                   $correctresponse = $answers[0];
@@ -555,24 +556,26 @@ function xml_entitize(&$collection) {
             else {
               $correctresponse = '';
             }
-            
+
             $smarty->assign('correctresponse', $correctresponse);
             $smarty->assign('answers', $answers);
             $expout = $smarty->fetch('choice.tpl');
             break;
         case MULTICHOICE:
             $answers = $this->objects_to_array($question->options->answers);
-            if (!empty($shuffleanswers)) {
-                $answers = $this->shuffle_things($answers);
-            }
             $correctresponses = $this->get_correct_answers($answers);
             $correctcount = count($correctresponses);
-
-        
-            $smarty->assign('responsedeclarationcardinality', $correctcount > 1 ? 'multiple' : 'single');
+            $smarty->assign('responsedeclarationcardinality', $question->options->single ? 'single' : 'multiple');
+            $smarty->assign('operator', $question->options->single ? 'match' : 'member');
             $smarty->assign('correctresponses', $correctresponses);
             $smarty->assign('answers', $answers);
             $smarty->assign('maxChoices', $question->options->single ? '1' : count($answers));
+            $smarty->assign('maxChoices', $question->options->single ? '1' : count($answers));
+            $smarty->assign('shuffle', empty($shuffleanswers) ? 'false' : 'true');
+            $smarty->assign('generalfeedback', $question->generalfeedback);
+            $smarty->assign('correctfeedback', $question->options->correctfeedback);
+            $smarty->assign('partiallycorrectfeedback', $question->options->partiallycorrectfeedback);
+            $smarty->assign('incorrectfeedback', $question->options->incorrectfeedback);
             $expout = $smarty->fetch('choiceMultiple.tpl');
             break;
         case SHORTANSWER:
@@ -580,7 +583,7 @@ function xml_entitize(&$collection) {
             if (!empty($shuffleanswers)) {
                 $answers = $this->shuffle_things($answers);
             }
-            
+
             $correctresponses = $this->get_correct_answers($answers);
             $correctcount = count($correctresponses);
 
@@ -591,9 +594,9 @@ function xml_entitize(&$collection) {
             break;
         case NUMERICAL:
             $qanswer = array_pop( $question->options->answers );
-            $smarty->assign('lowerbound', $qanswer->answer - $qanswer->tolerance);        
-            $smarty->assign('upperbound', $qanswer->answer + $qanswer->tolerance);        
-            $smarty->assign('answer', $qanswer->answer);        
+            $smarty->assign('lowerbound', $qanswer->answer - $qanswer->tolerance);
+            $smarty->assign('upperbound', $qanswer->answer + $qanswer->tolerance);
+            $smarty->assign('answer', $qanswer->answer);
             $expout = $smarty->fetch('numerical.tpl');
             break;
         case MATCH:
@@ -603,7 +606,7 @@ function xml_entitize(&$collection) {
                 $subquestions = $this->shuffle_things($subquestions);
             }
             $setcount = count($subquestions);
-        
+
             $smarty->assign('setcount', $setcount);
             $smarty->assign('matchsets', $subquestions);
             $expout = $smarty->fetch('match.tpl');
@@ -617,8 +620,8 @@ function xml_entitize(&$collection) {
         case MULTIANSWER:
             $answers = $this->get_cloze_answers_array($question);
             $questions = $this->get_cloze_questions($question, $answers, $allowedtags);
-            
-            $smarty->assign('cloze_trailing_text_id', CLOZE_TRAILING_TEXT_ID);            
+
+            $smarty->assign('cloze_trailing_text_id', CLOZE_TRAILING_TEXT_ID);
             $smarty->assign('answers', $answers);
             $smarty->assign('questions', $questions);
             $expout = $smarty->fetch('composite.tpl');
@@ -627,7 +630,7 @@ function xml_entitize(&$collection) {
             $smarty->assign('questionText', "This question type (Unknown: type $question_type)  has not yet been implemented");
             $expout = $smarty->fetch('notimplemented.tpl');
         }
-    
+
         // run through xml tidy function
         //$tidy_expout = $this->indent_xhtml( $expout, '    ' ) . "\n\n";
         //return $tidy_expout;
@@ -639,7 +642,7 @@ function xml_entitize(&$collection) {
  *
  * @param object $question
  * @return string containing a qti assesment item id
- */    
+ */
     function get_assesment_item_id($question) {
         return "question{$question->id}";
     }
@@ -649,7 +652,7 @@ function xml_entitize(&$collection) {
  *
  * @param array $answers
  * @return array (0-indexed) containing the answers whose grade fraction > 0
- */    
+ */
     function get_correct_answers($answers)
     {
         $correctanswers = array();
@@ -665,7 +668,7 @@ function xml_entitize(&$collection) {
  * gets a new Smarty object, with the template and compile directories set
  *
  * @return object a smarty object
- */    
+ */
     function & init_smarty() {
         global $CFG;
 
@@ -673,11 +676,11 @@ function xml_entitize(&$collection) {
         $path = $CFG->dataroot."/smarty_c";
         if (!is_dir($path)) {
             if (!mkdir($path, $CFG->directorypermissions)) {
-                print_error('cannotcreatepath', 'quiz', '', $path);
+              error("Cannot create path: $path");
             }
         }
         $smarty = new Smarty;
-        $smarty->template_dir = "{$CFG->dirroot}/question/format/qti_two/templates";
+        $smarty->template_dir = "{$CFG->dirroot}/question/format/qti2/templates";
         $smarty->compile_dir  = "$path";
         return $smarty;
     }
@@ -687,7 +690,7 @@ function xml_entitize(&$collection) {
  *
  * @param array $objectarray
  * @return array - an array of answer arrays
- */    
+ */
     function objects_to_array($objectarray)
     {
         $arrayarray = array();
@@ -696,13 +699,13 @@ function xml_entitize(&$collection) {
         }
         return $arrayarray;
     }
-    
+
 /**
  * gets a question's cloze answer objects as arrays containing only arrays and basic data types
  *
  * @param object $question
  * @return array - an array of answer arrays
- */    
+ */
     function get_cloze_answers_array($question) {
         $answers = $this->get_answers($question);
         $this->xml_entitize($answers);
@@ -711,7 +714,7 @@ function xml_entitize(&$collection) {
         }
         return $this->objects_to_array($answers);
     }
-    
+
 /**
  * gets an array with text and question arrays for the given cloze question
  *
@@ -722,13 +725,13 @@ function xml_entitize(&$collection) {
  * @param array $answers - an array of arrays containing the question's answers
  * @param string $allowabletags - tags not to strip out of the question text (e.g. '<i><br>')
  * @return array with text and question arrays for the given cloze question
- */    
+ */
      function get_cloze_questions($question, $answers, $allowabletags) {
         $questiontext = strip_tags($question->questiontext, $allowabletags);
         if (preg_match_all('/(.*){#([0-9]+)}/U', $questiontext, $matches)) {
             // matches[1] contains the text inbetween the question blanks
             // matches[2] contains the id of the question blanks (db: question_multianswer.positionkey)
-            
+
             // find any trailing text after the last {#XX} and add it to the array
             if (preg_match('/.*{#[0-9]+}(.*)$/', $questiontext, $tail)) {
                 $matches[1][] = $tail[1];
@@ -748,15 +751,15 @@ function xml_entitize(&$collection) {
                 // to have a matching number of question and text array entries:
                 $questions['question'][] = array('id'=>CLOZE_TRAILING_TEXT_ID, 'answertype'=>SHORTANSWER);
             }
-    
+
         } else {
             $questions['text'][0] = $question->questiontext;
             $questions['question'][0] = array('id'=>CLOZE_TRAILING_TEXT_ID, 'answertype'=>SHORTANSWER);
         }
-        
+
         return $questions;
     }
-    
+
 /**
  * strips out the <intro>...</intro> section, if any, and returns the text
  *
@@ -764,7 +767,7 @@ function xml_entitize(&$collection) {
  *
  * @param string $&text
  * @return string the intro text, if there was an intro tag. '' otherwise.
- */    
+ */
     function get_cloze_intro(&$text) {
         if (preg_match('/(.*)?\<intro>(.+)?\<\/intro>(.*)/s', $text, $matches)) {
             $text = $matches[1] . $matches[3];
@@ -773,16 +776,16 @@ function xml_entitize(&$collection) {
         else {
             return '';
         }
-    }             
-    
+    }
+
 
 /**
  * adds qti metadata properties to the questions
  *
- * The passed array of questions is altered by this function 
+ * The passed array of questions is altered by this function
  *
  * @param &questions an array of question objects
- */    
+ */
     function add_qti_info(&$questions)
     {
         foreach ($questions as $key=>$question) {
@@ -790,15 +793,15 @@ function xml_entitize(&$collection) {
             $questions[$key]->qtiscoreable = $this->get_qti_scoreable($question);
             $questions[$key]->qtisolutionavailable = $this->get_qti_solution_available($question);
         }
-        
+
     }
-    
+
 /**
  * returns whether or not a given question is scoreable
  *
  * @param object $question
  * @return boolean
- */    
+ */
     function get_qti_scoreable($question) {
         switch ($question->qtype) {
             case DESCRIPTION:
@@ -807,15 +810,15 @@ function xml_entitize(&$collection) {
                 return 'true';
         }
     }
-    
+
 /**
- * returns whether or not a solution is available for a given question 
+ * returns whether or not a solution is available for a given question
  *
  * The results are based on whether or not Moodle stores answers for the given question type
  *
  * @param object $question
  * @return boolean
- */    
+ */
     function get_qti_solution_available($question) {
         switch($question->qtype) {
             case TRUEFALSE:
@@ -835,15 +838,15 @@ function xml_entitize(&$collection) {
             default:
                 return 'true';
         }
-    
+
     }
-    
+
 /**
  * maps a moodle question type to a qti 2.0 question type
  *
  * @param int type_id - the moodle question type
  * @return string qti 2.0 question type
- */    
+ */
     function get_qti_interaction_type($type_id) {
         switch( $type_id ) {
         case TRUEFALSE:
@@ -879,9 +882,9 @@ function xml_entitize(&$collection) {
  *
  * @param array $things
  * @return array
- */    
+ */
     function shuffle_things($things) {
-        $things = swapshuffle_assoc($things);    
+        $things = swapshuffle_assoc($things);
         $oldthings = $things;
         $things = array();
         foreach ($oldthings as $key=>$value) {
@@ -889,15 +892,15 @@ function xml_entitize(&$collection) {
         }
         return $things;
     }
-    
+
 /**
  * returns a flattened image name - with all /, \ and : replaced with other characters
  *
  * used to convert a file or url to a qti-permissable identifier
  *
  * @param string name
- * @return string 
- */    
+ * @return string
+ */
     function flatten_image_name($name) {
         return str_replace(array('/', '\\', ':'), array ('_','-','.'), $name);
     }
@@ -916,4 +919,4 @@ function xml_entitize(&$collection) {
 
 }
 
-?>
+?>
\ No newline at end of file
index 1746330774ca32629ea2ab3199769b4e60f0ef50..9b6ac0d8ae4506c22b5ba2e99faeaa854071c7de 100755 (executable)
@@ -1,31 +1,26 @@
 {if $courselevelexport}<?xml version="1.0" encoding="UTF-8"?>{/if}
-<assessmentItem xmlns="http://www.imsglobal.org/xsd/imsqti_item_v2p0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.imsglobal.org/xsd/imsqti_item_v2p0 ./imsqti_item_v2p0.xsd" identifier="{$assessmentitemidentifier}" title="{$assessmentitemtitle}" adaptive="false" timeDependent="false">
+<assessmentItem xmlns="http://www.imsglobal.org/xsd/imsqti_v2p0"
+                               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                               xsi:schemaLocation="http://www.imsglobal.org/xsd/imsqti_v2p0 imsqti_v2p0.xsd"
+                               identifier="{$assessmentitemidentifier}" title="{$assessmentitemtitle}" adaptive="false" timeDependent="false">
        <responseDeclaration identifier="{$questionid}" cardinality="{$responsedeclarationcardinality}" baseType="identifier">
                <correctResponse>
                {section name=answer loop=$correctresponses}
                        <value>{$correctresponses[answer].id}</value>
                {/section}
                </correctResponse>
-               <mapping lowerBound="0" upperBound="1" defaultValue="-1">
-               {section name=answer loop=$answers}
-                   {if $answers[answer].fraction != 0}
-                       <mapEntry mapKey="{$answers[answer].id}" mappedValue="{$answers[answer].fraction}" />
-                       {/if}
-               {/section}
-               </mapping>
        </responseDeclaration>
-       <outcomeDeclaration identifier="SCORE" cardinality="single" baseType="float" />
+       <outcomeDeclaration identifier="SCORE" cardinality="single" baseType="float">
+               <defaultValue>
+                       <value>0</value>
+               </defaultValue>
+       </outcomeDeclaration>
+       <outcomeDeclaration identifier="FEEDBACK" cardinality="{$responsedeclarationcardinality}" baseType="identifier"/>
+       <outcomeDeclaration identifier="FEEDBACK2" cardinality="single" baseType="identifier"/>
        <itemBody>
           <div class="assesmentItemBody">
                <p>{$questionText}</p>
        </div>
-               <div class="interactive.choiceMultiple">
-                       <choiceInteraction responseIdentifier="{$questionid}" shuffle="false" maxChoices="{$maxChoices}">
-               {section name=answer loop=$answers}
-                               <simpleChoice identifier="{$answers[answer].id}" fixed="false">{$answers[answer].answer}</simpleChoice>
-               {/section}
-                       </choiceInteraction>
-               </div>
        {if $question_has_image == 1}
                <div class="media">
            {if $hassize == 1}
                {/if}
                </div>
        {/if}
+               <div class="interactive.choiceMultiple">
+                       <choiceInteraction responseIdentifier="{$questionid}" shuffle="{$shuffle}" maxChoices="{$maxChoices}">
+               {section name=answer loop=$answers}
+                               <simpleChoice identifier="i{$answers[answer].id}">{$answers[answer].answer}                
+                               {if $answers[answer].feedback != ''}
+                               {if $answers[answer].answer != $correctresponse.answer}
+                                   <feedbackInline identifier="i{$answers[answer].id}" outcomeIdentifier="FEEDBACK" showHide="show">{$answers[answer].feedback}</feedbackInline>
+                    {/if}
+                {/if}
+                               </simpleChoice>
+               {/section}
+                       </choiceInteraction>
+               </div>
        </itemBody>
-       <responseProcessing xmlns="http://www.imsglobal.org/xsd/imsqti_item_v2p0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.imsglobal.org/xsd/imsqti_item_v2p0 ../imsqti_item_v2p0.xsd">
+       <responseProcessing> 
+               {section name=answer loop=$answers}
                <responseCondition>
                        <responseIf>
-                               <isNull>
+                               <{$operator}>
+                                       <baseValue baseType="identifier">i{$answers[answer].id}</baseValue>
                                        <variable identifier="{$questionid}"/>
-                               </isNull>
+                               </{$operator}>
                                <setOutcomeValue identifier="SCORE">
+                                       <sum>
+                                               <variable identifier="SCORE"/>
+                                               <baseValue baseType="float">{$answers[answer].fraction}</baseValue>
+                                       </sum>
+                               </setOutcomeValue>
+                       </responseIf>
+               </responseCondition>
+               {/section}
+               <responseCondition>
+                       <responseIf>
+                               <lte>
+                                       <variable identifier="SCORE"/>
                                        <baseValue baseType="float">0</baseValue>
+                               </lte>
+                               <setOutcomeValue identifier="SCORE">
+                                       <baseValue baseType="float">0</baseValue>
+                               </setOutcomeValue>
+                               <setOutcomeValue identifier="FEEDBACK2">
+                                       <baseValue baseType="identifier">INCORRECT</baseValue>
                                </setOutcomeValue>
                        </responseIf>
-                       <responseElse>
+                       <responseElseIf>
+                               <gte>
+                                       <variable identifier="SCORE"/>
+                                       <baseValue baseType="float">0.99</baseValue>
+                               </gte>
                                <setOutcomeValue identifier="SCORE">
-                                       <mapResponse identifier="{$questionid}"/>
+                                       <baseValue baseType="float">1</baseValue>
+                               </setOutcomeValue>
+                               <setOutcomeValue identifier="FEEDBACK2">
+                                       <baseValue baseType="identifier">CORRECT</baseValue>
+                               </setOutcomeValue>
+                       </responseElseIf>
+                       <responseElse>
+                               <setOutcomeValue identifier="FEEDBACK2">
+                                       <baseValue baseType="identifier">PARTIAL</baseValue>
                                </setOutcomeValue>
                        </responseElse>
                </responseCondition>
             <variable identifier="{$questionid}"/>
         </setOutcomeValue>             
        </responseProcessing>
-       {section name=answer loop=$answers}
-        {if $answers[answer].feedback != ''}
-       <modalFeedback outcomeIdentifier="FEEDBACK" identifier="{$answers[answer].id}" showHide="show">{$answers[answer].feedback}</modalFeedback>
-       {/if}
-       {/section}
+    {if $correctfeedback != ''}
+       <modalFeedback outcomeIdentifier="FEEDBACK2" identifier="CORRECT" showHide="show">{$correctfeedback}</modalFeedback>
+       {/if}
+    {if $partiallycorrectfeedback != ''}
+       <modalFeedback outcomeIdentifier="FEEDBACK2" identifier="PARTIAL" showHide="show">{$partiallycorrectfeedback}</modalFeedback>
+       {/if}
+    {if $incorrectfeedback != ''}
+       <modalFeedback outcomeIdentifier="FEEDBACK2" identifier="INCORRECT" showHide="show">{$incorrectfeedback}</modalFeedback>
+       {/if}
+    {if $generalfeedback != ''}
+       <modalFeedback outcomeIdentifier="completionStatus" identifier="not_attempted" showHide="hide">{$generalfeedback}</modalFeedback>
+       {/if}
 </assessmentItem>