Commit 4b0fd939 authored by Rob Hulswit's avatar Rob Hulswit

Merge branch 'feature/ah.rollup.20200320' into 'master'

Feature/ah.rollup.20200320

See merge request !240
parents 40418871 3b715d5e
......@@ -555,9 +555,6 @@ PUBLIC RECORD FUNCTION CheckGroup(RECORD data, RECORD options DEFAULTSTO DEFAULT
, data := CellExists(obj, "DATA") ? obj.data : DEFAULT RECORD
FROM provider->ListObjects3(data.commanddate, data.groupid, options.rebuild ? DEFAULT RECORD ARRAY : existing_objects, CELL[ options.rebuild ]) AS obj;
IF(options.debugobjects)
DumpValue(objects, "boxed");
// For deactivation, we only need to know if ListObjects throws, no more action needed (or wanted)
IF (NOT options.deactivate)
{
......@@ -600,6 +597,9 @@ PUBLIC RECORD FUNCTION CheckGroup(RECORD data, RECORD options DEFAULTSTO DEFAULT
existing_commanddate := existing_objects[obj.existing_pos.position].commanddate;
}
IF(options.debugobjects)
Print(`Fetching object, group: ${data.groupid}, object: ${objects[cur].id} (${cur}/${Length(objects)})\n`);
// Fetch and index the object, new objects within the group are returned
RECORD cmdresult := FetchObject(source, provider, data.groupid, objects[cur].id, objects[cur].data, data.commanddate, existing_indexdate, existing_commanddate, options.rebuild);
......
......@@ -79,7 +79,7 @@ PUBLIC STATIC OBJECTTYPE Queries EXTEND DashboardPanelBase
[ catalog := TRUE
, tag := query.catalog
, id := 0
, query := query.searchquery
, query := query.query
]);
scr->RunModal();
}
......
Markdown is supported
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