CDPP / AMDA_IHM

Commit 4d8105717abbeb61e4bc861b7b1505c2a0abff7e

Authored by Elena.Budnik
1 parent 8b6bb092
Exists in master and in 95 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, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, master_vge, mlplasmas, multiplot, openam, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

add rank for Ephemerides and PlanetsProperties

Showing 1 changed file with 45 additions and 19 deletions   Show diff stats
Inline Side-by-side
update_amda/makeTree.php
  Diff comments   View file @4d81057
... ... @@ -39,26 +39,52 @@
39 39  
40 40 if (is_array($cmpArr))
41 41 {
42   - $targetMis = $mission->getAttribute('target');
43   - $index = $cmpArr[$targetMis];
44   - if ($index)
45   - $nodeNew->setAttribute('rank',$index);
46   - else $nodeNew->setAttribute('rank', 999);
47   -
48   - $observatories = $nodeNew->getElementsByTagName('observatory');
49   - if ($observatories->length > 0)
50   - {
51   - foreach ($observatories as $obs)
52   - {
53   - if ($obs->hasAttribute('target'))
54   - {
55   - $target = $obs->getAttribute('target');
56   - $index = $cmpArr[$target];
57   - if ($index && $target != $targetMis)
58   - $obs->setAttribute('rank',$index);
59   - }
60   - }
  42 + if ($mission->getAttribute('xml:id') == 'Ephemerides') { // Planets and Moons
  43 + $datasets = $nodeNew->getElementsByTagName('dataset');
  44 + foreach ($datasets as $ds ) {
  45 + $target = $ds->getAttribute('target');
  46 + $index = $cmpArr[$target];
  47 + if ($index) {
  48 + if ( $ds->parentNode->tagName == 'datasetGroup' ) {
  49 + if (!$ds->parentNode->hasAttribute('rank')) {
  50 + $ds->parentNode->setAttribute('rank',$index);
  51 + }
  52 + } else {
  53 + $ds->setAttribute('rank',$index);
  54 + }
  55 + }
  56 + }
61 57 }
  58 + else if ($mission->getAttribute('xml:id') == 'PlanetsProperties') {
  59 + $instruments = $nodeNew->getElementsByTagName('instrument');
  60 + foreach ($instruments as $ins ) {
  61 + $target = $ins->getAttribute('name');
  62 + $index = $cmpArr[$target];
  63 + if ($index)
  64 + $ins->setAttribute('rank',$index);
  65 + }
  66 + }
  67 +
  68 + $targetMis = $mission->getAttribute('target');
  69 + $index = $cmpArr[$targetMis];
  70 + if ($index)
  71 + $nodeNew->setAttribute('rank',$index);
  72 + else $nodeNew->setAttribute('rank', 999);
  73 +
  74 + $observatories = $nodeNew->getElementsByTagName('observatory');
  75 + if ($observatories->length > 0)
  76 + {
  77 + foreach ($observatories as $obs)
  78 + {
  79 + if ($obs->hasAttribute('target'))
  80 + {
  81 + $target = $obs->getAttribute('target');
  82 + $index = $cmpArr[$target];
  83 + if ($index && $target != $targetMis)
  84 + $obs->setAttribute('rank',$index);
  85 + }
  86 + }
  87 + }
62 88 }
63 89 //TODO set propre restriction
64 90 $Amda->appendChild($nodeNew);
... ...