MDL-7068 - SCORM 2004 compliance. Handle cmi.interactions hydration (scorm 1.2 to...

diff --git a/mod/scorm/datamodels/scorm_12.js.php b/mod/scorm/datamodels/scorm_12.js.php
index e565ae8285a7716fda2a74c1b9348b94a6eb0eb9..4e4589f99e52ce569dd16723cf7043503ccfa54c 100644 (file)
--- a/mod/scorm/datamodels/scorm_12.js.php
+++ b/mod/scorm/datamodels/scorm_12.js.php
@@ -41,6 +41,7 @@ function SCORMapi1_2() {
     score_children = 'raw, min, max';
     comments_children = 'content, location, time';
     objectives_children = 'id, score, status';
+    correct_responses_children = 'pattern';
     student_data_children = 'mastery_score, max_time_allowed, time_limit_action';
     student_preference_children = 'audio, language, speed, text';
     interactions_children = 'id, objectives, time, type, correct_responses, weighting, student_response, result, latency';
@@ -141,8 +142,9 @@ function SCORMapi1_2() {
 <?php
      // reconstitute objectives
     scorm_reconstitute_array_element($scorm->version, $userdata, 'cmi.objectives', array('score'));
-?>
-
+    scorm_reconstitute_array_element($scorm->version, $userdata, 'cmi.interactions', array('objectives', 'correct_responses'));
+    ?>
+    
     if (cmi.core.lesson_status == '') {
         cmi.core.lesson_status = 'not attempted';
     } 

diff --git a/mod/scorm/datamodels/scorm_13.js.php b/mod/scorm/datamodels/scorm_13.js.php
index b17ff574941858cb2d42ebb23adc73019d7e32a5..68f88e3248d5067a06021a44797e7ebe6fbbddff 100644 (file)
--- a/mod/scorm/datamodels/scorm_13.js.php
+++ b/mod/scorm/datamodels/scorm_13.js.php
@@ -55,6 +55,7 @@ function SCORMapi1_3() {
     var comments_children = 'comment, timestamp, location';
     var score_children = 'max, raw, scaled, min';
     var objectives_children = 'progress_measure, completion_status, success_status, description, score, id';
+    var correct_responses_children = 'pattern';
     var student_data_children = 'mastery_score, max_time_allowed, time_limit_action';
     var student_preference_children = 'audio_level, audio_captioning, delivery_speed, language';
     var interactions_children = 'id, type, objectives, timestamp, correct_responses, weighting, learner_response, result, latency, description';
@@ -208,6 +209,7 @@ function SCORMapi1_3() {
 <?php
     // reconstitute objectives, comments_from_learner and comments_from_lms
     scorm_reconstitute_array_element($scorm->version, $userdata, 'cmi.objectives', array('score'));
+    scorm_reconstitute_array_element($scorm->version, $userdata, 'cmi.interactions', array('objectives', 'correct_responses'));
     scorm_reconstitute_array_element($scorm->version, $userdata, 'cmi.comments_from_learner', array());
     scorm_reconstitute_array_element($scorm->version, $userdata, 'cmi.comments_from_lms', array());
 ?>

diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index ae3d0d641de421c0f217a1e6eaf39c35f66ba0ef..f261a84db12a0812df2abfb75744dad687c649d7 100755 (executable)
--- a/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@ -752,7 +752,10 @@ function scorm_get_count_users($scormid, $groupingid=null) {
 function scorm_reconstitute_array_element($sversion, $userdata, $element_name, $children) {
     // reconstitute comments_from_learner and comments_from_lms
     $current = '';
+    $current_subelement = '';
+    $current_sub = '';
     $count = 0;
+    $count_sub = 0;
     
     // filter out the ones we want
     $element_list = array();
@@ -768,15 +771,21 @@ function scorm_reconstitute_array_element($sversion, $userdata, $element_name, $
     // generate JavaScript
     foreach($element_list as $element => $value){
         if ($sversion == 'scorm_13') {
-            $element = preg_replace('/\.(\d+)\./', ".N\$1.", $element);
+            $element = preg_replace('/.*?\.(\d+)\./', ".N\$1.", $element);
             preg_match('/\.(N\d+)\./', $element, $matches);
         } else {
-            $element = preg_replace('/\.(\d+)\./', "_\$1.", $element);
+            $element = preg_replace('/.*?\.(\d+)\./', "_\$1.", $element);
             preg_match('/\_(\d+)\./', $element, $matches);
         }
         if (count($matches) > 0 && $current != $matches[1]) {
+            if ($count_sub > 0) {
+                echo '    '.$element_name.'_'.$current.'.'.$current_subelement.'._count = '.$count_sub.";\n";
+            }
             $current = $matches[1];            
             $count++;
+            $current_subelement = '';
+            $current_sub = '';
+            $count_sub = 0;
             $end = strpos($element,$matches[1])+strlen($matches[1]);
             $subelement = substr($element,0,$end);
             echo '    '.$subelement." = new Object();\n";
@@ -786,8 +795,43 @@ function scorm_reconstitute_array_element($sversion, $userdata, $element_name, $
                 echo '    '.$subelement.".".$child."._children = ".$child."_children;\n";
             }
         }
+        
+        // now - flesh out the second level elements if there are any
+        if ($sversion == 'scorm_13') {
+            $element = preg_replace('/.*?\.N\d+\..*?\.(\d+)\./', ".N\$1.", $element);
+            preg_match('/.*?\.N\d+\.(.*?)\.(N\d+)\./', $element, $matches);
+        } else {
+            $element = preg_replace('/.*?\_\d+\..*?\.(\d+)\./', "_\$1.", $element);
+            preg_match('/.*?\_\d+\.(.*?)\_(\d+)\./', $element, $matches);
+        }
+        
+        // check the sub element type
+        if (count($matches) > 0 && $current_subelement != $matches[1]) {
+            if ($count_sub > 0) {
+                echo '    '.$element_name.'_'.$current.'.'.$current_subelement.'._count = '.$count_sub.";\n";
+            }
+            $current_subelement = $matches[1];
+            $current_sub = '';
+            $count_sub = 0;
+            $end = strpos($element,$matches[1])+strlen($matches[1]);
+            $subelement = substr($element,0,$end);
+            echo '    '.$subelement." = new Object();\n";
+        }
+        
+        // now check the subelement subscript
+        if (count($matches) > 0 && $current_sub != $matches[2]) {
+            $current_sub = $matches[2];            
+            $count_sub++;
+            $end = strrpos($element,$matches[2])+strlen($matches[2]);
+            $subelement = substr($element,0,$end);
+            echo '    '.$subelement." = new Object();\n";
+        }
+        
         echo '    '.$element.' = \''.$value."';\n";
     }
+    if ($count_sub > 0) {
+        echo '    '.$element_name.'_'.$current.'.'.$current_subelement.'._count = '.$count_sub.";\n";
+    }
     if ($count > 0) {
         echo '    '.$element_name.'._count = '.$count.";\n";
     }
@@ -801,15 +845,36 @@ function scorm_reconstitute_array_element($sversion, $userdata, $element_name, $
 * @return comparator - 0,1,-1
 */   
 function scorm_element_cmp($a, $b) {
-    preg_match('/(\d+)\./', $a, $matches);
+    preg_match('/.*?(\d+)\./', $a, $matches);
     $left = intval($matches[1]);
-    preg_match('/(\d+)\./', $b, $matches);
+    preg_match('/.?(\d+)\./', $b, $matches);
     $right = intval($matches[1]);
     if ($left < $right) {
         return -1; // smaller
     } elseif ($left > $right) {
         return 1;  // bigger
     } else {
+        // look for a second level qualifier eg cmi.interactions_0.correct_responses_0.pattern
+        if (preg_match('/.*?(\d+)\.(.*?)\.(\d+)\./', $a, $matches)) {
+            $leftterm = intval($matches[2]);
+            $left = intval($matches[3]);
+            if (preg_match('/.*?(\d+)\.(.*?)\.(\d+)\./', $b, $matches)) {
+                $rightterm = intval($matches[2]);
+                $right = intval($matches[3]);
+                if ($leftterm < $rightterm) {
+                    return -1; // smaller
+                } elseif ($leftterm > $rightterm) {
+                    return 1;  // bigger
+                } else {
+                    if ($left < $right) {
+                        return -1; // smaller
+                    } elseif ($left > $right) {
+                        return 1;  // bigger
+                    }
+                }
+            }
+        }
+        // fall back for no second level matches or second level matches are equal
         return 0;  // equal to
     }
 }