Changeset 368 in tmcsimulator for trunk/webapps/EInotebook

Timestamp:

04/16/2019 06:03:08 AM (7 years ago)

Author:

jdalbey

Message:

LoadEvents? modified to use incident_script.xml

File:

• trunk/webapps/EInotebook/scripts/LoadEvents.js (modified) (1 diff)

trunk/webapps/EInotebook/scripts/LoadEvents.js

@@ -142 +142 @@
 // MAIN
 console.log("starting LoadEvents");
-/** Load the sim script name file and extract the filename of the Incident Script */
-loadJSON("../sim_scriptname.json", function(response)
-{
-    console.log("scriptname file loaded");
-    try {
-        var scriptnamejson = JSON.parse(response);
-        // For now the script must be located in the EInotebook folder.
-        // It would be better to use the file located in trunk/scripts folder. 
-        var scriptFilename = scriptnamejson.filename;
-        console.log("Attempting to load", scriptFilename);
-        // Now load the Incident Script and go parse it
-        loadJSON(scriptFilename, parseXml)
+try {
+    // the script must be located where accessible by the web server
+    var scriptFilename = "incident_script.xml";
+    console.log("Attempting to load", scriptFilename);
+    // Now load the Incident Script and go parse it
+    loadJSON(scriptFilename, parseXml)
 
-        } catch(e) {
-            console.log("Error attempt to parse sim_scriptname.json: "+response)
-        }
-});
+    } catch(e) {
+        console.log("Error attempt to parse incident script "+response)
+    }
 
+