Duplicates check for schema query

#304
cwrc · Mar 30, 2015 · e78274b · e78274b
1 parent 8e92c4f
commit e78274b
Showing 1 changed file with 53 additions and 42 deletions.
diff --git a/src/js/utilities.js b/src/js/utilities.js
@@ -650,56 +650,67 @@ return function(writer) {
                 return;
             }
 
-            var childObj = {
-                name: child['@name'],
-                level: level+0,
-                documentation: docs
-            };
+            var duplicate = false;
+            children.every(function(entry, index, array) {
+                if (entry.name === child['@name']) {
+                    duplicate = true;
+                    return false;
+                }
+                return true;
+            });
 
-            if (type == 'attribute') {
-                if (refParentProps && refParentProps.optional != null) {
-                    childObj.required = !refParentProps.optional;
-                } else {
-                    childObj.required = true;
-                    _queryUp(child['$parent'], function(item) {
-                        if (item.optional) {
-                            childObj.required = false;
+            if (!duplicate) {
+                var childObj = {
+                    name: child['@name'],
+                    level: level+0,
+                    documentation: docs
+                };
+
+                if (type == 'attribute') {
+                    if (refParentProps && refParentProps.optional != null) {
+                        childObj.required = !refParentProps.optional;
+                    } else {
+                        childObj.required = true;
+                        _queryUp(child['$parent'], function(item) {
+                            if (item.optional) {
+                                childObj.required = false;
+                                return false;
+                            }
+                        });
+                    }
+
+                    var defaultVal = null;
+                    _queryDown(child, function(item) {
+                        if (item['@a:defaultValue']) {
+                            defaultVal = item['@a:defaultValue'];
                             return false;
                         }
                     });
-                }
-
-                var defaultVal = null;
-                _queryDown(child, function(item) {
-                    if (item['@a:defaultValue']) {
-                        defaultVal = item['@a:defaultValue'];
-                        return false;
-                    }
-                });
-                childObj.defaultValue = defaultVal || '';
-
-                var choice = null;
-                _queryDown(child, function(item) {
-                    if (item.choice) {
-                        choice = item.choice;
-                        return false;
-                    }
-                });
-                if (choice != null) {
-                    var choices = [];
-                    var values = [];
-                    _queryDown(choice, function(item) {
-                        if (item.value) {
-                            values = item.value;
+                    childObj.defaultValue = defaultVal || '';
+
+                    var choice = null;
+                    _queryDown(child, function(item) {
+                        if (item.choice) {
+                            choice = item.choice;
+                            return false;
                         }
                     });
-                    for (var j = 0; j < values.length; j++) {
-                        choices.push(values[j]);
+                    if (choice != null) {
+                        var choices = [];
+                        var values = [];
+                        _queryDown(choice, function(item) {
+                            if (item.value) {
+                                values = item.value;
+                            }
+                        });
+                        for (var j = 0; j < values.length; j++) {
+                            choices.push(values[j]);
+                        }
+                        childObj.choices = choices;
                     }
-                    childObj.choices = choices;
                 }
+                children.push(childObj);
             }
-            children.push(childObj);
         }
 
         // now process the references
@@ -950,7 +961,7 @@ return function(writer) {
                 return checkForText(def, defHits, level+1, canContainText);
             }
         });
-    };
+    }
 
     /**
      * Checks to see if the tag can contain text, as specified in the schema