CDPP / AMDA_IHM

Commit 7ac2915f2a35c03b230e8bbaf9610a11ccd3c11f

Authored by Myriam Bouchemit
1 parent 2b27251b
Exists in master and in 109 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, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, 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

call initUserMgr for all WS + changes for WS with impex user

Showing 1 changed file with 5 additions and 5 deletions   Show diff stats
Inline Side-by-side
php/WebServices/WebServer.php
  Diff comments   View file @7ac2915
... ... @@ -119,7 +119,7 @@ class WebServer
119 119 */
120 120 private function getTimeTablesCatalogsList($object)
121 121 {
122   - $this->initUserMgr(true);
  122 + $this->initUserMgr();
123 123 $dom = new DOMDocument("1.0");
124 124  
125 125 if ($this->userID == 'impex') {
... ... @@ -336,12 +336,12 @@ class WebServer
336 336 $this->throwError('workspaceError', 'No Amda Local DataBase Parameters description file for '.$this->userID);
337 337  
338 338 if (!copy($wsParamSrc, WSConfigClass::getWsResultDir().$wsParamDst))
339   - $this->throwError('workspaceError', 'No User Defined Parameters description file for '.$this->userID);
  339 + return array('success' => true,'ParameterList' =>
  340 + array("LocalDataBaseParameters" => WSConfigClass::getUrl().$locParamDst));
340 341  
341 342 return array('success' => true,'ParameterList' =>
342 343 array("UserDefinedParameters" => WSConfigClass::getUrl().$wsParamDst,
343   - "LocalDataBaseParameters" => WSConfigClass::getUrl().$locParamDst,
344   - "RemoteDataBaseParameters" => "not implemented"));
  344 + "LocalDataBaseParameters" => WSConfigClass::getUrl().$locParamDst));
345 345 }
346 346  
347 347 /*
... ... @@ -572,7 +572,7 @@ class WebServer
572 572 $this->throwError("requestError", "Cannot parse request");
573 573 }
574 574  
575   - $this->initUserMgr(true);
  575 + $this->initUserMgr();
576 576  
577 577 $ttID = $res['vars']['ttID'];
578 578  
... ...