diff --git a/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php b/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php index e2bb798..ba63919 100644 --- a/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php +++ b/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php @@ -255,6 +255,12 @@ class IHMJobsManagerClass { ); } + private function logObj($obj) { + $f = fopen('/AMDA/AMDA_Integration/test/serialise.json', 'w') or die("Unable to open debug file!"); + fwrite($f, json_encode($obj, JSON_PRETTY_PRINT)); + fclose($f); + } + /* * @brief Add a new job */ @@ -265,10 +271,6 @@ class IHMJobsManagerClass { if (!$res['success']) return $res; -// $f = fopen('/AMDA/AMDA_Integration/debug/serialise.json', 'w') or die("Unable to open file!"); -// fwrite($f, json_encode($obj, JSON_PRETTY_PRINT)); -// fclose($f); - $infos = []; switch ($obj['nodeType']) { // Data mining @@ -360,13 +362,7 @@ class IHMJobsManagerClass { foreach ($panel->params as $param) { $strParams .= $param->paramid . ($param === end($panel->params) ? '' : ', '); } - $strPanels[] = $strParams; - } - - if(count($strPanels) == 1) { - $infos['Parameters'] = $strPanels[0]; - } else { - $infos['Panels'] = '<ul><li>' . join('</li><li>', $strPanels) . '</li></ul>'; + $infos['• Panel ' . $panel->id] = $strParams; } continue; @@ -466,7 +462,7 @@ class IHMJobsManagerClass { $infos['Job duration'] = $interval->format('%Hh %Im %Ss'); $res_dir = USERWORKINGDIR . $job->getAttribute('folder') . '/'; - $fileSize = filesize ( glob($res_dir.'/' . $job->getAttribute('result') . '.*')[0]); + $fileSize = filesize ( glob($res_dir.'/' . $job->getAttribute('result') . '*')[0]); if ($fileSize < 1024) { $strSize = number_format($fileSize, 2, '.', ' ') . 'b'; } else if($fileSize < 1024*1024) { -- libgit2 0.21.2