Ticket #1374: errorReport.2.patch

gui/common/functions_civinfo.js

@@ -7 +7 @@
 
 
 function loadCivData()
-{   // Load all JSON files containing civ data
+{
+    // Load all JSON files containing civ data
     var civData = {};
     var civFiles = Engine.BuildDirEntList("civs/", "*.json", false);
     
     for each (var filename in civFiles)
-    {   // Parse data if valid file
+    {
+        // Parse data if valid file
         var data = parseJSONData(filename);
+        if (Object.keys(data).length == 0)
+            continue;
         translateObjectKeys(data, ["Name", "Description", "History", "Special"]);
         civData[data.Code] = data;
     }

simulation/components/TechnologyTemplateManager.js

@@ -19 +19 @@
 {
     if (!this.allTechs[template])
     {
-        this.allTechs[template] = Engine.ReadJSONFile("technologies/" + template + ".json");
-        if (!this.allTechs[template])
-            error("Failed to load technology \"" + template + "\"");
+        try
+        {
+            this.allTechs[template] = Engine.ReadJSONFile("technologies/" + template + ".json");
+        }
+        catch (err)
+        {
+            error(sprintf("%(error)s in '%(path)s'", { error: err.toString(), path: template }));
+        }
     }
 
-    return this.allTechs[template];
+    return this.allTechs[template] || false;
 };
 
 TechnologyTemplateManager.prototype.GetAuraTemplate = function(template)

simulation/components/TechnologyManager.js

@@ -283 +283 @@
 
     if (!template)
     {
-        error("Tried to research invalid techonology: " + uneval(tech));
+        error("Tried to research invalid technology: " + uneval(tech));
         return;
     }
 

simulation/components/ProductionQueue.js

@@ -241 +241 @@
             // Find the template data so we can determine the build costs
             var cmpTempMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
             var template = cmpTempMan.GetTemplate(templateName);
-            if (!template)
+            if (!template || Object.keys(template) == 0)
                 return;
             if (template.Promotion)
             {