CDPP / AMDA_IHM

Commit 00dedb86d00f1d278aa56c73e440b98e555605d0

Authored by Elena.Budnik
1 parent d9c16908
Exists in master and in 111 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

getUrlFinishedJob

Showing 1 changed file with 28 additions and 3 deletions   Show diff stats
Inline Side-by-side
php/classes/WebServer.php
  Diff comments   View file @00dedb8
... ... @@ -428,10 +428,35 @@ class WebServer
428 428 if (!isset($this->requestManager))
429 429 $this->requestManager = new RequestManagerClass();
430 430  
431   - try {
  431 + try
  432 + {
432 433 $res = $this->requestManager->runWSRequest($this->userID, 'unknown', FunctionTypeEnumClass::PROCESSGETINFO, null, $id);
433   - } catch (Exception $e) {
434   - $this->throwError("getStatusError", "Exeption detected : ".$e->getMessage());
  434 + }
  435 + catch (Exception $e)
  436 + {
  437 +// if ($e->getMessage() == "Exception detected : Request execution error : Cannot get process from id" )
  438 +// {
  439 + // after first getStatus() call process is cleaned up
  440 + $jobsManager = new WSJobsManagerClass();
  441 +
  442 + try
  443 + {
  444 + $res = $jobsManager->getResultFromProcessId($id);
  445 + if (!$res['success']) {
  446 + $this->throwError("processError","Cannot retrieve process $id info");
  447 + }
  448 +
  449 + return array('success' => true, 'status' => 'done', 'dataFileURLs' => WSConfigClass::getUrl().$res['result']);
  450 + }
  451 + catch (Exception $e)
  452 + {
  453 + $this->throwError("getResultFromProcessIdError", "Exception detected : ".$e->getMessage());
  454 + }
  455 +// }
  456 +// else
  457 +// {
  458 +// $this->throwError("getStatusError", "Exception detected : ".$e->getMessage());
  459 +// }
435 460 }
436 461  
437 462 if (!$res['success']) {
... ...