CDPP / AMDA_IHM

Commit 41dacd789b17e6896e55c558fdf9c0d5be1d7a0f

Authored by Elena Budnik
2 parents 4bf776ac b64d304e
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

Merge branch 'groups-for-webservices' into 'master' 

Groups for webservices

See merge request !29
Showing 2 changed files with 38 additions and 6 deletions   Show diff stats
Inline Side-by-side
php/WebServices/WSUserMgr.php
  Diff comments   View file @41dacd7
... ... @@ -55,6 +55,7 @@ class WSUserMgr extends UserMgr
55 55 if ( $setPathOnly )
56 56 return array('success' => true);
57 57  
  58 + $this->userGrps = $this->getUserGrps();
58 59 $this->makeLocalTree();
59 60 $this->makeRemoteTree();
60 61  
... ...
php/WebServices/WebServer.php
  Diff comments   View file @41dacd7
... ... @@ -54,10 +54,10 @@ class WebServer
54 54 return array('success' => true, 'vars' => $vars);
55 55 }
56 56  
57   - private function initUserMgr($setPatOnly = false)
  57 + private function initUserMgr($setPathOnly = false)
58 58 {
59 59 $wsUserMgr = new WSUserMgr();
60   - $wsUserMgr->init($this->userID, $this->userPWD, $this->sessionID, $setPatOnly, $this->isSoap);
  60 + $wsUserMgr->init($this->userID, $this->userPWD, $this->sessionID, $setPathOnly, $this->isSoap);
61 61  
62 62 $this->IPclient = $wsUserMgr->getIPClient();
63 63  
... ... @@ -297,7 +297,34 @@ class WebServer
297 297  
298 298 return array('success' => true, 'token' => $newToken);
299 299 }
  300 +
  301 + private function excludePrivateNodes($locParamSrc, $locParamDst)
  302 + {
  303 + $locParamSrcDom = new DomDocument("1.0");
  304 + $locParamSrcDom->preserveWhiteSpace = FALSE; /// Important !!! otherwise removeChild() leaves empty text nodes
  305 +
  306 + if (!$locParamSrcDom->load($locParamSrc))
  307 + $this->throwError("getObsDataTree", "Cannot load Amda Local DataBase Parameters description file".$this->userID);
  308 +
  309 + $xp = new domxpath($locParamSrcDom);
  310 + $restricted = $xp->query("//*[@group]");
300 311  
  312 + foreach ($restricted as $node) {
  313 + $parentNode = $node->parentNode;
  314 + $parentNode->removeChild($node);
  315 +
  316 + if (!$parentNode->hasChildNodes()) {
  317 + if ($parentNode->parentNode){
  318 + $parentParentNode = $parentNode->parentNode;
  319 + $parentParentNode->removeChild($parentNode);
  320 + }
  321 + }
  322 + }
  323 +
  324 + if (!$locParamSrcDom->save(WSConfigClass::getWsResultDir().$locParamDst))
  325 + $this->throwError('workspaceError', 'Cannot save Amda Local DataBase Parameters description file'.$this->userID);
  326 + }
  327 +
301 328 /************************** WEB SERVICES **************************************/
302 329  
303 330 /*
... ... @@ -309,11 +336,13 @@ class WebServer
309 336 $this->initUserMgr();
310 337  
311 338 $locParamSrc = USERWSDIR.'LocalParams.xml';
  339 +
312 340 $locParamDst = substr(strtolower(__FUNCTION__),3).'_'.$this->userID.'_'.$this->requestTime.'_AmdaLocalDataBaseParameters.xml';
313 341  
314   - if (!copy($locParamSrc,WSConfigClass::getWsResultDir().$locParamDst))
315   - $this->throwError('workspaceError', 'No Amda Local DataBase Parameters description file');
  342 +// if (!copy($locParamSrc,WSConfigClass::getWsResultDir().$locParamDst))
  343 +// $this->throwError('workspaceError', 'No Amda Local DataBase Parameters description file');
316 344  
  345 + $this->excludePrivateNodes($locParamSrc,$locParamDst);
317 346 return array('success' => true,'WorkSpace' => array("LocalDataBaseParameters" => WSConfigClass::getUrl().$locParamDst));
318 347 }
319 348  
... ... @@ -333,8 +362,10 @@ class WebServer
333 362 $locParamDst = substr(strtolower(__FUNCTION__),3).'_'.$this->userID.'_'.$this->requestTime.'_AmdaLocalDataBaseParameters.xml';
334 363 $wsParamDst = substr(strtolower(__FUNCTION__),3).'_'.$this->userID.'_'.$this->requestTime.'_UserDefinedParameters.xml';
335 364  
336   - if (!copy($locParamSrc, WSConfigClass::getWsResultDir().$locParamDst))
337   - $this->throwError('workspaceError', 'No Amda Local DataBase Parameters description file for '.$this->userID);
  365 +// if (!copy($locParamSrc, WSConfigClass::getWsResultDir().$locParamDst))
  366 +// $this->throwError('workspaceError', 'No Amda Local DataBase Parameters description file for '.$this->userID);
  367 +
  368 + $this->excludePrivateNodes($locParamSrc,$locParamDst);
338 369  
339 370 if (!copy($wsParamSrc, WSConfigClass::getWsResultDir().$wsParamDst))
340 371 return array('success' => true,'ParameterList' =>
... ...