comparison test_create/test_create.html @ 1898:db85dec2b0b0

Fixed errors caused by specifcation nesting, specifically if <page> interface nodes have <interfaceoption> nodes.

             this.interfaces = null;
             this.loudness = null;
             this.errors = [];
             this.schema = null;
 
-            this.processAttribute = function(attribute,schema)
+            this.processAttribute = function(attribute,schema,schemaRoot)
             {
                 // attribute is the string returned from getAttribute on the XML
                 // schema is the <xs:attribute> node
                 if (schema.getAttribute('name') == undefined && schema.getAttribute('ref') != undefined)
                 {
-                    schema = this.schema.getAllElementsByName(schema.getAttribute('ref'))[0];
+                    schema = schemaRoot.getAllElementsByName(schema.getAttribute('ref'))[0];
                 }
                 var defaultOpt = schema.getAttribute('default');
                 if (attribute == null) {
                     attribute = defaultOpt;
                 }

                 // First decode the attributes
                 var attributes = schemaSetup.getAllElementsByTagName('xs:attribute');
                 for (var i in attributes)
                 {
                     if (isNaN(Number(i)) == true){break;}
-                    var attributeName = attributes[i].getAttribute('name');
+                    var attributeName = attributes[i].getAttribute('name') || attributes[i].getAttribute('ref');
                     var projectAttr = setupNode.getAttribute(attributeName);
-                    projectAttr = this.processAttribute(projectAttr,attributes[i]);
+                    projectAttr = this.processAttribute(projectAttr,attributes[i],this.schema);
                     switch(typeof projectAttr)
                     {
                     case "number":
                     case "boolean":
                         eval('this.'+attributeName+' = '+projectAttr);

             };
 
             this.surveyNode = function() {
                 this.location = null;
                 this.options = [];
+                this.parent = null;
                 this.schema = specification.schema.getAllElementsByName('survey')[0];
 
                 this.OptionNode = function() {
                     this.type = undefined;
                     this.schema = specification.schema.getAllElementsByName('surveyentry')[0];

                         var attributeMap = this.schema.getAllElementsByTagName('xs:attribute');
                         for (var i in attributeMap){
                             if(isNaN(Number(i)) == true){break;}
                             var attributeName = attributeMap[i].getAttribute('name') || attributeMap[i].getAttribute('ref');
                             var projectAttr = child.getAttribute(attributeName);
-                            projectAttr = parent.processAttribute(projectAttr,attributeMap[i]);
+                            projectAttr = parent.processAttribute(projectAttr,attributeMap[i],parent.schema);
                             switch(typeof projectAttr)
                             {
                             case "number":
                             case "boolean":
                                 eval('this.'+attributeName+' = '+projectAttr);

                         }
                         return node;
                     };
                 };
                 this.decode = function(parent,xml) {
+                    this.parent = parent;
                     this.location = xml.getAttribute('location');
                     if (this.location == 'before'){this.location = 'pre';}
                     else if (this.location == 'after'){this.location = 'post';}
                     for (var i in xml.children)
                     {

                         var option = {};
                         for (var j=0; j<attributeMap.length; j++)
                         {
                             var attributeName = attributeMap[j].getAttribute('name') || attributeMap[j].getAttribute('ref');
                             var projectAttr = ioNode.getAttribute(attributeName);
-                            projectAttr = parent.processAttribute(projectAttr,attributeMap[j]);
+                            if(parent.processAttribute) {
+                                parent.processAttribute(projectAttr, attributeMap[j], parent.schema)
+                            } else {
+                                parent.parent.processAttribute(projectAttr, attributeMap[j], parent.parent.schema)
+                            }
                             switch(typeof projectAttr)
                             {
                             case "number":
                             case "boolean":
                                 eval('option.'+attributeName+' = '+projectAttr);

                 this.randomiseOrder = undefined;
                 this.loop = undefined;
                 this.showElementComments = undefined;
                 this.outsideReference = null;
                 this.loudness = null;
+                this.label = null;
                 this.preTest = null;
                 this.postTest = null;
                 this.interfaces = [];
                 this.commentBoxPrefix = "Comment on track";
                 this.audioElements = [];
                 this.commentQuestions = [];
                 this.schema = specification.schema.getAllElementsByName("page")[0];
+                this.parent = null;
 
                 this.decode = function(parent,xml)
                 {
+                    this.parent = parent;
                     var attributeMap = this.schema.getAllElementsByTagName('xs:attribute');
                     for (var i=0; i<attributeMap.length; i++)
                     {
                         var attributeName = attributeMap[i].getAttribute('name') || attributeMap[i].getAttribute('ref');
                         var projectAttr = xml.getAttribute(attributeName);
-                        projectAttr = parent.processAttribute(projectAttr,attributeMap[i]);
+                        projectAttr = parent.processAttribute(projectAttr,attributeMap[i],parent.schema);
                         switch(typeof projectAttr)
                         {
                         case "number":
                         case "boolean":
                             eval('this.'+attributeName+' = '+projectAttr);

                         var attributeMap = this.schema.getAllElementsByTagName('xs:attribute');
                         for (var i=0; i<attributeMap.length; i++)
                         {
                             var attributeName = attributeMap[i].getAttribute('name') || attributeMap[i].getAttribute('ref');
                             var projectAttr = xml.getAttribute(attributeName);
-                            projectAttr = specification.processAttribute(projectAttr,attributeMap[i]);
+                            projectAttr = parent.parent.processAttribute(projectAttr,attributeMap[i],parent.parent.schema);
                             switch(typeof projectAttr)
                             {
                             case "number":
                             case "boolean":
                                 eval('this.'+attributeName+' = '+projectAttr);