From c504285645b918b3d1725053899d1cf054870291 Mon Sep 17 00:00:00 2001
From: Dan Marsden <Dan@digitalclay.co.nz>
Date: Fri, 19 Nov 2010 23:35:12 +0000
Subject: [PATCH] SCORM MDL-25320 removes spaces from children patterns -
 thanks to Ian Wright for report

---
 mod/scorm/datamodels/scorm_12.js.php | 16 ++++++++--------
 mod/scorm/datamodels/scorm_13.js.php | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/mod/scorm/datamodels/scorm_12.js.php b/mod/scorm/datamodels/scorm_12.js.php
index 7b010879007..1d30bcf6d89 100644
--- a/mod/scorm/datamodels/scorm_12.js.php
+++ b/mod/scorm/datamodels/scorm_12.js.php
@@ -36,15 +36,15 @@ function SCORMapi1_2() {
     CMIResult = '^correct$|^wrong$|^unanticipated$|^neutral$|^([0-9]{0,3})?(\.[0-9]{1,2})?$';
     NAVEvent = '^previous$|^continue$';
     // Children lists
-    cmi_children = 'core, suspend_data, launch_data, comments, objectives, student_data, student_preference, interactions';
-    core_children = 'student_id, student_name, lesson_location, credit, lesson_status, entry, score, total_time, lesson_mode, exit, session_time';
-    score_children = 'raw, min, max';
-    comments_children = 'content, location, time';
-    objectives_children = 'id, score, status';
+    cmi_children = 'core,suspend_data,launch_data,comments,objectives,student_data,student_preference,interactions';
+    core_children = 'student_id,student_name,lesson_location,credit,lesson_status,entry,score,total_time,lesson_mode,exit,session_time';
+    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';
+    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';
     // Data ranges
     score_range = '0#100';
     audio_range = '-1#100';
diff --git a/mod/scorm/datamodels/scorm_13.js.php b/mod/scorm/datamodels/scorm_13.js.php
index 4e2a37f9861..16ac757465f 100644
--- a/mod/scorm/datamodels/scorm_13.js.php
+++ b/mod/scorm/datamodels/scorm_13.js.php
@@ -88,14 +88,14 @@ function SCORMapi1_3() {
     var NAVBoolean = '^unknown$|^true$|^false$';
     var NAVTarget = '^previous$|^continue$|^choice.{target=\\S{0,200}[a-zA-Z0-9]}$'
     // Children lists
-    var cmi_children = '_version, comments_from_learner, comments_from_lms, completion_status, credit, entry, exit, interactions, launch_data, learner_id, learner_name, learner_preference, location, max_time_allowed, mode, objectives, progress_measure, scaled_passing_score, score, session_time, success_status, suspend_data, time_limit_action, total_time';
-    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 cmi_children = '_version,comments_from_learner,comments_from_lms,completion_status,credit,entry,exit,interactions,launch_data,learner_id,learner_name,learner_preference,location,max_time_allowed,mode,objectives,progress_measure,scaled_passing_score,score,session_time,success_status,suspend_data,time_limit_action,total_time';
+    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';
+    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';
     // Data ranges
     var scaled_range = '-1#1';
     var audio_range = '0#*';
@@ -1267,4 +1267,4 @@ if (debugging('',DEBUG_DEVELOPER)) {
     include_once($CFG->dirroot.'/mod/scorm/datamodels/debug.js.php');
     echo 'AppendToLog("Moodle SCORM 1.3 API Loaded, Activity: '.$scorm->name.', SCO: '.$sco->identifier.'", 0);';
 }
- ?>
\ No newline at end of file
+ ?>