CDPP / AMDA_IHM

Commit 3ec3ea9ceecf2b3c6dedf82d835d11fba7e96828

Authored by Elena.Budnik
1 parent 2ac8da6c
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, 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, 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

add spectra

Showing 1 changed file with 27 additions and 1 deletions   Show diff stats
Inline Side-by-side
php/classes/UserWsTransfer.php
  Diff comments   View file @3ec3ea9
@@ -7,7 +7,7 @@ class UserWsTransfer { @@ -7,7 +7,7 @@ class UserWsTransfer {
7 7
8 private $oldWs, $newWs, $Mgr; 8 private $oldWs, $newWs, $Mgr;
9 private $oldWsDir, $newWsDir; 9 private $oldWsDir, $newWsDir;
10 - private $ws_deleted, $wsd_deleted, $pairs; 10 + private $ws_deleted, $wsd_deleted, $pairs, $specParams;
11 11
12 function __construct($user) 12 function __construct($user)
13 { 13 {
@@ -29,6 +29,7 @@ class UserWsTransfer { @@ -29,6 +29,7 @@ class UserWsTransfer {
29 $this->ws_deleted = array(); 29 $this->ws_deleted = array();
30 $this->wsd_deleted = array(); 30 $this->wsd_deleted = array();
31 $this->getModified(); 31 $this->getModified();
  32 + $this->getSpectra();
32 } 33 }
33 34
34 private function getObsolete() { 35 private function getObsolete() {
@@ -125,6 +126,20 @@ class UserWsTransfer { @@ -125,6 +126,20 @@ class UserWsTransfer {
125 $this->pairs = $pairs; 126 $this->pairs = $pairs;
126 } 127 }
127 128
  129 + private function getSpectra()
  130 + {
  131 + $convertXML = new DomDocument("1.0");
  132 + $modifiedFile = CONVERSIONDIR.'SpectraModifs.xml';
  133 +
  134 + if (!$convertXML->load($modifiedFile))
  135 + error_log('ERROR loading '.$modifiedFile,1,email);
  136 + $convertedNodes = $convertXML->getElementsByTagName('deleted');
  137 +
  138 + foreach ($convertedNodes as $item) {
  139 + $this->specParams[] = $item->getAttribute('xml:id');
  140 + }
  141 + }
  142 +
128 private function updateParams($expression) 143 private function updateParams($expression)
129 { 144 {
130 $newExp = strtr($expression, $this->pairs); 145 $newExp = strtr($expression, $this->pairs);
@@ -255,6 +270,12 @@ class UserWsTransfer { @@ -255,6 +270,12 @@ class UserWsTransfer {
255 continue; 270 continue;
256 } 271 }
257 272
  273 + if ($this->deleteParam($expression,$this->spectraParams)) {
  274 + $msg .= '<li><i>'.$name.'</i> : too much difference <br/> '.$expression.'<br/>';
  275 + $this->ws_deleted[] = $name;
  276 + continue;
  277 + }
  278 +
258 $expressionUpdated = $this->updateParams($expression); 279 $expressionUpdated = $this->updateParams($expression);
259 $wsParamNode->appendChild($this->newWs->importNode($param)); 280 $wsParamNode->appendChild($this->newWs->importNode($param));
260 281
@@ -390,6 +411,11 @@ class UserWsTransfer { @@ -390,6 +411,11 @@ class UserWsTransfer {
390 continue; 411 continue;
391 } 412 }
392 413
  414 + if ($this->deleteParam($expression,$this->specParams)) {
  415 + $msg .= '<li><i>'.$name.'</i> : too much difference <br/> '.$expression.'<br/>';
  416 + $cond_deleted[] = $name;
  417 + continue;
  418 + }
393 $expressionUpdated = $this->updateParams($expression); 419 $expressionUpdated = $this->updateParams($expression);
394 $condObj->expression = $expressionUpdated; 420 $condObj->expression = $expressionUpdated;
395 file_put_contents(NEWUSERPATH.TRANSFERUSER."/REQ/".$id, json_encode($condObj)); 421 file_put_contents(NEWUSERPATH.TRANSFERUSER."/REQ/".$id, json_encode($condObj));