CDPP / AMDA_IHM

Commit 7b51463679965fde403461412b8222f8d1a7cc65

Authored by Elena.Budnik
1 parent 981cd087
Exists in master and in 110 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, 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 migration post processing

Showing 3 changed files with 30 additions and 6 deletions   Show diff stats
Inline Side-by-side
generic_data/migration/Modified.xml
  Diff comments   View file @7b51463
... ... @@ -20,7 +20,6 @@
20 20 <param_convert xml:id="vex_venus_r" oldid="sys_vex_r"/>
21 21 <param_convert xml:id="it_v_gse" oldid="it_v"/>
22 22 <param_convert xml:id="cass_wl" oldid="cass_wl_iau"/>
23   - <!--<param_convert xml:id="mex_mars_r" oldid="pol_mex_pc(0)"/>-->
24 23 <param_convert xml:id="lat_mex_iau" oldid="pol_mex_pc(1)"/>
25 24 <param_convert xml:id="lon_mex_iau" oldid="pol_mex_pc(2)"/>
26 25 <param_convert xml:id="b_t96gsm" oldid="bt96"/>
... ...
generic_data/migration/PostProcess.xml 0 → 100644
  Diff comments   View file @7b51463
... ... @@ -0,0 +1,4 @@
  1 +<?xml version="1.0"?>
  2 +<conversion>
  3 + <param_convert xml:id="sw_vb" oldid="sw_v_gseb"/>
  4 +</conversion>
... ...
php/classes/UserWsTransfer.php
  Diff comments   View file @7b51463
... ... @@ -7,7 +7,7 @@ class UserWsTransfer {
7 7  
8 8 private $oldWs, $newWs, $Mgr;
9 9 private $oldWsDir, $newWsDir;
10   - private $ws_deleted, $wsd_deleted, $pairs, $specParams;
  10 + private $ws_deleted, $wsd_deleted, $pairs, $specParams, $postPairs;
11 11  
12 12 function __construct($user)
13 13 {
... ... @@ -29,6 +29,7 @@ class UserWsTransfer {
29 29 $this->ws_deleted = array();
30 30 $this->wsd_deleted = array();
31 31 $this->getModified();
  32 + $this->getReprocessed();
32 33 $this->getSpectra();
33 34 }
34 35  
... ... @@ -127,6 +128,23 @@ class UserWsTransfer {
127 128 $this->pairs = $pairs;
128 129 }
129 130  
  131 + private function getReprocessed()
  132 + {
  133 + $convertXML = new DomDocument("1.0");
  134 + $modifiedFile = CONVERSIONDIR.'PostProcess.xml';
  135 +
  136 + if (!$convertXML->load($modifiedFile))
  137 + error_log('ERROR loading '.$modifiedFile,1,email);
  138 + $convertedNodes = $convertXML->getElementsByTagName('param_convert');
  139 +
  140 + foreach ($convertedNodes as $item) {
  141 + $pairs[$item->getAttribute('oldid')] = $item->getAttribute('xml:id');
  142 + }
  143 + krsort($pairs, SORT_NATURAL);
  144 +
  145 + $this->postPairs = $pairs;
  146 + }
  147 +
130 148 private function getSpectra()
131 149 {
132 150 $convertXML = new DomDocument("1.0");
... ... @@ -144,11 +162,13 @@ class UserWsTransfer {
144 162 private function updateParams($expression)
145 163 {
146 164 $newExp = strtr($expression, $this->pairs);
147   - $expression = $newExp;
148   -
149   - return $expression;
  165 + if (!empty($this->postPairs))
  166 + $expFinal = strtr($newExp, $this->postPairs);
  167 +
  168 + return $expFinal;
150 169 }
151   -
  170 +
  171 +
152 172 protected function createDom()
153 173 {
154 174 $types = array('param' => 'derived', 'mydata' => 'myData');
... ... @@ -273,6 +293,7 @@ class UserWsTransfer {
273 293 if ($nodeInWS) {
274 294 $buildchain = $nodeInWS->getAttribute('buildchain');
275 295 $buildchainUpdated = $this->updateParams($buildchain);
  296 +
276 297 $nodeInWS->setAttribute('buildchain',$buildchainUpdated);
277 298 }
278 299 }
... ...