Skip to content
Snippets Groups Projects
Commit ec8e6f96 authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

L2SS-1189: MACScheduler should only poll for tmss observation subtasks with lofar1 stations only

parent 67712903
No related branches found
No related tags found
1 merge request!1067L2SS-1189
Hide whitespace changes
Inline Side-by-side
MAC/APL/MainCU/src/MACScheduler/TMSSBridge.cc
+ 3
− 3
View file @ ec8e6f96
...@@ -83,7 +83,7 @@ Json::Value TMSSBridge::getObservationSubTasksStartingInThreeMinutes() ...@@ -83,7 +83,7 @@ Json::Value TMSSBridge::getObservationSubTasksStartingInThreeMinutes()
ptime upper_limit = from_time_t(now+3*60); ptime upper_limit = from_time_t(now+3*60);
//TODO: make exact query as in SAS/OTDB/sql/getTreeGroup_func.sql with OR'd states and exact timewindow //TODO: make exact query as in SAS/OTDB/sql/getTreeGroup_func.sql with OR'd states and exact timewindow
string queryStr = "/api/subtask/?subtask_type=observation&state__value=scheduled&scheduled_start_time__gt=" + to_iso_extended_string(lower_limit) + "&scheduled_start_time__lt=" + to_iso_extended_string(upper_limit) + "&ordering=scheduled_start_time"; string queryStr = "/api/subtask/?subtask_type=observation&state__value=scheduled&is_using_lofar2_stations=False&scheduled_start_time__gt=" + to_iso_extended_string(lower_limit) + "&scheduled_start_time__lt=" + to_iso_extended_string(upper_limit) + "&ordering=scheduled_start_time";
Json::Value result; Json::Value result;
if(httpGETAsJson(queryStr, result)) if(httpGETAsJson(queryStr, result))
...@@ -95,7 +95,7 @@ Json::Value TMSSBridge::getActiveObservationSubTasks() ...@@ -95,7 +95,7 @@ Json::Value TMSSBridge::getActiveObservationSubTasks()
{ {
ptime now = from_time_t(time(0)); ptime now = from_time_t(time(0));
//TODO: make exact query as in SAS/OTDB/sql/getTreeGroup_func.sql with OR'd states and exact timewindow //TODO: make exact query as in SAS/OTDB/sql/getTreeGroup_func.sql with OR'd states and exact timewindow
string queryStr = "/api/subtask/?subtask_type=observation&state__value=started&scheduled_start_time__lt=" + to_iso_extended_string(now) + "&scheduled_stop_time__gt=" + to_iso_extended_string(now) + "&&ordering=scheduled_start_time"; string queryStr = "/api/subtask/?subtask_type=observation&state__value=started&is_using_lofar2_stations=False&scheduled_start_time__lt=" + to_iso_extended_string(now) + "&scheduled_stop_time__gt=" + to_iso_extended_string(now) + "&&ordering=scheduled_start_time";
Json::Value result; Json::Value result;
if(httpGETAsJson(queryStr, result)) if(httpGETAsJson(queryStr, result))
...@@ -107,7 +107,7 @@ Json::Value TMSSBridge::getFinishingObservationSubTasks() ...@@ -107,7 +107,7 @@ Json::Value TMSSBridge::getFinishingObservationSubTasks()
{ {
ptime justnow = from_time_t(time(0)-3*60); ptime justnow = from_time_t(time(0)-3*60);
//TODO: make exact query as in SAS/OTDB/sql/getTreeGroup_func.sql with OR'd states and exact timewindow //TODO: make exact query as in SAS/OTDB/sql/getTreeGroup_func.sql with OR'd states and exact timewindow
string queryStr = "/api/subtask/?subtask_type=observation&state__value=finishing&scheduled_stop_time__gt=" + to_iso_extended_string(justnow) + "&ordering=scheduled_start_time"; string queryStr = "/api/subtask/?subtask_type=observation&state__value=finishing&is_using_lofar2_stations=False&scheduled_stop_time__gt=" + to_iso_extended_string(justnow) + "&ordering=scheduled_start_time";
Json::Value result; Json::Value result;
if(httpGETAsJson(queryStr, result)) if(httpGETAsJson(queryStr, result))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment