CDPP / AMDA_Integration

Commit 97a69b2087f7b72b9f880f2e31c0297c30985e52

Authored by Benjamin Renard
1 parent 84cb4dbb
Exists in master and in 65 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akka-scatter-multi-xparams, amdadev, anr_tempete, cu2022, density_maps, develop, evol-6371, expression-parser-bre, frames-transformation, install-rework, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_5357, rm_6595, rm_6912, rm_7926, rm_8932, save-other-requests, shared-objects-updater, sum-components-indexes, test-merge, webservice, ws_get_catalog

Fix most of errors logged by apache

Showing 3 changed files with 4 additions and 3 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
  Diff comments   View file @97a69b2
... ... @@ -27,6 +27,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
27 27 $this->interactiveRequestRealIndexes = array();
28 28  
29 29 $fullResetZoom = false;
  30 + $forceTimeZoomReset = false;
30 31  
31 32 if (isset($input->{'action'}))
32 33 {
... ... @@ -650,7 +651,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
650 651 foreach ($paramsData as $paramData)
651 652 {
652 653 //Param
653   - $paramInfo = $this->paramManager->addExistingParam($paramData->{'paramid'}, $this->paramsData, $paramData->{'template_args'});
  654 + $paramInfo = $this->paramManager->addExistingParam($paramData->{'paramid'}, $this->paramsData, isset($paramData->{'template_args'}) ? $paramData->{'template_args'} : NULL);
654 655  
655 656 $paramInfo['indexes'] = array();
656 657  
... ...
src/InputOutput/IHMImpl/Params/StatisticsImpl/IHMInputOutputParamsStatisticsClass.php
  Diff comments   View file @97a69b2
... ... @@ -54,7 +54,7 @@ class IHMInputOutputParamsStatisticsClass extends IHMInputOutputParamsAbstractCl
54 54 foreach ($paramFunctionAssociation as $param => $functions)
55 55 {
56 56 // template parameter
57   - if ($paramTemplateArgs[$param])
  57 + if (!empty($paramTemplateArgs[$param]))
58 58 {
59 59 foreach ($functions as $function)
60 60 {
... ...
src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
  Diff comments   View file @97a69b2
... ... @@ -272,7 +272,7 @@ class IHMJobsManagerClass {
272 272 break;
273 273 case 'statistics' :
274 274 $name = 'statistics_'.time();
275   - $info = $obj->expression;
  275 + $info = isset($obj->expression) ? $obj->expression : "";
276 276 break;
277 277 case 'download' :
278 278 if ($obj->downloadSrc == '2') //fits image
... ...