From: bobopinna <bobopinna>
Date: Mon, 14 May 2007 12:27:12 +0000 (+0000)
Subject: Removed maxmodel unuseful variable
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a5fcd78018ea4076e74b270dc2a08a544f9bff06;p=moodle.git

Removed maxmodel unuseful variable
This could fix also cmi.interactions.n.learner_response problem
---

diff --git a/mod/scorm/datamodels/scorm_13.js.php b/mod/scorm/datamodels/scorm_13.js.php
index 39596988ef..6d29e4d8cb 100644
--- a/mod/scorm/datamodels/scorm_13.js.php
+++ b/mod/scorm/datamodels/scorm_13.js.php
@@ -434,10 +434,11 @@ function SCORMapi1_3() {
 
                                     if (((typeof eval(subelement)) == "undefined") && (errorCode == "0")) {
                                         parentmodel = 'cmi.objectives';
-                                        maxmodel = 'cmi.objectives.Nxxx.id';
+                                        //maxmodel = 'cmi.objectives.Nxxx.id';
                                         if (subelement.substr(0,parentmodel.length) == parentmodel) {
 
-                                             if ((elemlen <= maxmodel.length) && (element.substr(elemlen-2) == 'id') && (errorCode=="0")) { 
+                                            // if ((elemlen <= maxmodel.length) && (element.substr(elemlen-2) == 'id') && (errorCode=="0")) { 
+                                             if ((elementmodel==parentmodel+'.n.id') && (errorCode=="0")) { 
 
                                                 //This is a parentmodel.n.id element
                                                 if (!duplicatedID(parentmodel,value)) {
@@ -473,14 +474,13 @@ function SCORMapi1_3() {
                                             }
                                         } else {
 
-
-
                                             parentmodel = 'cmi.interactions';
-                                            maxmodel = 'cmi.interactions.Nxxx.id';
+                                            //maxmodel = 'cmi.interactions.Nxxx.id';
 
                                             if (subelement.substr(0,parentmodel.length) == parentmodel) {
 
-                                                if ((elemlen <= maxmodel.length) && (element.substr(elemlen-2) == 'id') && (errorCode=="0")) { 
+                                                //if ((elemlen <= maxmodel.length) && (element.substr(elemlen-2) == 'id') && (errorCode=="0")) { 
+                                                if ((elementmodel==parentmodel+'.n.id') && (errorCode=="0")) { 
 
                                                     //This is a parentmodel.n.id element
                                                     if (!duplicatedID(parentmodel,value)) {
@@ -505,13 +505,14 @@ function SCORMapi1_3() {
                                                         diagnostic = "Data Model Element ID Already Exists";
                                                     }
                                                 } else {
-
+//alert('model ='+elementmodel+' subelement ='+subelement);
                                                     if (typeof eval(subelement) == "undefined") {
 
                                                         errorCode="408";
                                                     } else {
-                                                        maxmodel = 'cmi.interactions.Nxxx.type';
-                                                        if ((elemlen <= maxmodel.length) && (element.substr(elemlen-4) == 'type') && (errorCode=="0")) { 
+                                                        //maxmodel = 'cmi.interactions.Nxxx.type';
+                                                        //if ((elemlen <= maxmodel.length) && (element.substr(elemlen-4) == 'type') && (errorCode=="0")) { 
+                                                        if ((elementmodel==parentmodel+'.n.type') && (errorCode=="0")) { 
                                                             subobject = eval(subelement);
                                                            //subobject.correct_responses = new Object();
                                                            //subobject.correct_responses._count = 0;
@@ -533,9 +534,10 @@ function SCORMapi1_3() {
                                      } else {
 
                                          parentmodel = 'cmi.objectives';
-                                         maxmodel = 'cmi.objectives.Nxxx.id';
+                                         //maxmodel = 'cmi.objectives.Nxxx.id';
                                          if (subelement.substr(0,parentmodel.length) == parentmodel) {
-                                             if ((elemlen <= maxmodel.length) && (element.substr(elemlen-2) == 'id') && (errorCode=="0")) {
+                                             //if ((elemlen <= maxmodel.length) && (element.substr(elemlen-2) == 'id') && (errorCode=="0")) {
+                                             if ((elementmodel==parentmodel+'.n.id') && (errorCode=="0")) { 
 
                                                  if (eval(element) != value) {
                                                      errorCode = "351";
@@ -545,9 +547,10 @@ function SCORMapi1_3() {
                                          } else {
 
                                              parentmodel = 'cmi.interactions';
-                                             maxmodel = 'cmi.interactions.Nxxx.id';
+                                             //maxmodel = 'cmi.interactions.Nxxx.id';
                                              if (subelement.substr(0,parentmodel.length) == parentmodel) {
-                                                 if ((elemlen <= maxmodel.length) && (element.substr(elemlen-2) == 'id') && (errorCode=="0")) { 
+                                                 //if ((elemlen <= maxmodel.length) && (element.substr(elemlen-2) == 'id') && (errorCode=="0")) { 
+                                                 if ((elementmodel==parentmodel+'.n.id') && (errorCode=="0")) { 
                                                      if (eval(element) != value) {
                                                          errorCode = "351";
                                                          diagnostic = "Write Once Violation";