Changeset 15291

Timestamp:

04/10/13 10:19:30 (12 years ago)

Author:

tbretz

Message:

Read the schedule from the database instead of the file directly. The old version is still available as MainClassic.js

File:

• trunk/FACT++/scripts/Main.js (modified) (9 diffs)

trunk/FACT++/scripts/Main.js

@@ -16 +16 @@
 include('scripts/Observation_class.js');
 
+/*
 // this file just contains the definition of
 // the variable observations, which builds our nightly schedule, hence the filename
@@ -32 +33 @@
     }
 }
+*/
+
+include('scripts/ReadSchedule.js');
+
+var observations = [ ];
 
 // Get the observation scheduled for 'now' from the table and
@@ -42 +48 @@
     if (isNaN(now.valueOf()))
         throw new Error("Date argument in getObservation invalid.");
+
+    observations = getSchedule();
 
     for (var i=0; i<observations.length; i++)
@@ -350 +358 @@
     dim.wait("MCP", "Idle", time>0 ? time*1250 : undefined); // run time plus 25%
 
+    console.out("debug: "+incomplete);
+
     if (incomplete)
     {
@@ -790 +800 @@
 var run = -2; // getObservation never called
 var sub;
-var lastObs;
+var lastId;
 var sun = Sun.horizon(-13);
 var system_on;  // undefined
@@ -828 +838 @@
 
     // Check if observation target has changed
-    if (lastObs!=idxObs) // !Object.isEqual(obs, nextObs)
-    {
-        console.out("--- "+idxObs+" ---");
+    if (lastId!=obs.id) // !Object.isEqual(obs, nextObs)
+    {
+        console.out("--- "+obs.id+" ---");
         console.out("Current time:        "+new Date().toUTCString());
         console.out("Current observation: "+obs.start.toUTCString());
@@ -855 +865 @@
         run = 0;
     }
-    lastObs = idxObs;
+    lastId = obs.id;
 
     if (nextObs==undefined && obs[obs.length-1].task!="SHUTDOWN")
@@ -868 +878 @@
     }
 
-    var task = obs[sub].task;
-
     // Check if sun is still up... only DATA and RATESCAN must be suppressed
-    if ((task=="DATA" || task=="RATESCAN") && sun.isUp)
+    if ((obs[sub].task=="DATA" || obs[sub].task=="RATESCAN") && sun.isUp)
     {
         var now = new Date();
@@ -916 +924 @@
         ];
 
+
     if (!checkStates(table))
     {