CDPP / AMDA_IHM

Commit 6dd4aa36ba5ef96f691c6fbeeecd6fcfb48c129a

Authored by Elena.Budnik
2 parents 4f1b0c0f ca3c8dea
Exists in master and in 106 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, 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-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, special-params, sum-components-indexes, test-merge, ws_get_catalog

Merge branch 'master' into simplified-view-checkbox

Showing 5 changed files with 54 additions and 3 deletions   Show diff stats
Inline Side-by-side
generic_data/compilation/.gitignore 0 → 100644
  Diff comments   View file @6dd4aa3
... ... @@ -0,0 +1,2 @@
  1 +*
  2 +!.gitignore
... ...
php/classes/SharedObjectMgrAbstract.php
  Diff comments   View file @6dd4aa3
... ... @@ -80,6 +80,19 @@ abstract class SharedObjectMgrAbstract {
80 80  
81 81 return array('success' => TRUE, 'object_id' => $newId);
82 82 }
  83 +
  84 + public function createFolder($folder_name) {
  85 + $folder_path = $this->getFolderDirPath($folder_name);
  86 + if (is_dir($folder_path)) {
  87 + return FALSE;
  88 + }
  89 +
  90 + mkdir($folder_path);
  91 + chgrp($folder_path, APACHE_USER);
  92 + chmod($folder_path, 0775);
  93 +
  94 + return is_dir($folder_path);
  95 + }
83 96  
84 97 public function getRootDirPath() {
85 98 return SHAREDPATH . "/" . $this->rootdirname;
... ... @@ -158,4 +171,4 @@ abstract class SharedObjectMgrAbstract {
158 171 }
159 172 }
160 173  
161   -?>
162 174 \ No newline at end of file
  175 +?>
... ...
php/classes/SharedObjectTreeFile.php
  Diff comments   View file @6dd4aa3
... ... @@ -50,9 +50,32 @@ class SharedObjectTreeFile {
50 50 $objectNode->setAttribute($key, $value);
51 51 }
52 52 }
53   -
  53 + $this->doc->save($this->getFilePath());
54 54  
55 55 //Remove obsolete folders and objects
  56 + $folders = $this->getFolders($object_type);
  57 + foreach ($folders as $folder) {
  58 + $folderNode = $this->getObjectFolderNode($object_type, $folder["name"]);
  59 + if (!isset($folderNode)) {
  60 + continue;
  61 + }
  62 + if (!array_key_exists($folder["name"], $objects)) {
  63 + $folderNode->parentNode->removeChild($folderNode);
  64 + }
  65 + else {
  66 + $objectNodes = $folderNode->getElementsByTagName($object_type);
  67 + $to_remove = array();
  68 + foreach ($objectNodes as $objectNode) {
  69 + $idAtt = $objectNode->getAttribute('xml:id');
  70 + if (!in_array($idAtt, $objects[$folder["name"]])) {
  71 + $to_remove[] = $objectNode;
  72 + }
  73 + }
  74 + foreach ($to_remove as $node) {
  75 + $folderNode->removeChild($node);
  76 + }
  77 + }
  78 + }
56 79  
57 80 $this->doc->save($this->getFilePath());
58 81  
... ...
php/classes/SharedObjectsMgr.php
  Diff comments   View file @6dd4aa3
... ... @@ -57,6 +57,18 @@ class SharedObjectsMgr {
57 57  
58 58 return $this->treeFile->getFolders($object_type);
59 59 }
  60 +
  61 + public function createFolder($object_type, $folder_name) {
  62 + if (!array_key_exists($object_type, $this->sharedObjectsMgr) || !isset($this->sharedObjectsMgr[$object_type])) {
  63 + return array('success' => FALSE, 'message' => 'Unknown type');
  64 + }
  65 +
  66 + if (!$this->sharedObjectsMgr[$object_type]->createFolder($folder_name)) {
  67 + return array('success' => FALSE, 'message' => 'Cannot create folder '.$folder_name);
  68 + }
  69 +
  70 + return $this->updateTree();
  71 + }
60 72  
61 73 public function isNameAlreadyUsed($object_type, $name) {
62 74 if (!array_key_exists($object_type, $this->sharedObjectsMgr) || !isset($this->sharedObjectsMgr[$object_type]))
... ... @@ -96,4 +108,4 @@ class SharedObjectsMgr {
96 108 }
97 109 }
98 110  
99   -?>
100 111 \ No newline at end of file
  112 +?>
... ...
php/config.php
  Diff comments   View file @6dd4aa3
... ... @@ -87,6 +87,7 @@ define('RemoteData', DATAPATH.'/RemoteData/');
87 87 define('Functions', DATAPATH.'/Functions/');
88 88 define('Hst', DATAPATH.'/Hst/');
89 89 define('SpecialSettingsDir',DATAPATH.'/SpecialSettings/');
  90 +define('CommonLib', DATAPATH.'/compilation/lib/');
90 91  
91 92 // General Info files
92 93 define('orbitsXml',LocalData.'/Orbites.xml');
... ...