Commit 8b6bb092eb28d93f51747832a394bfbb4c109a68

Authored by Elena.Budnik
1 parent 4a9e0229

icones if rank is defined

Showing 1 changed file with 3 additions and 23 deletions   Show diff stats
php/classes/AmdaAction.php
@@ -129,7 +129,6 @@ class AmdaAction @@ -129,7 +129,6 @@ class AmdaAction
129 if ($child->nodeType == XML_ELEMENT_NODE) 129 if ($child->nodeType == XML_ELEMENT_NODE)
130 { 130 {
131 $isLeaf = true; 131 $isLeaf = true;
132 -  
133 if ($child->hasChildNodes()) 132 if ($child->hasChildNodes())
134 foreach ($child->childNodes as $grandChild) 133 foreach ($child->childNodes as $grandChild)
135 if ($grandChild -> nodeType == XML_ELEMENT_NODE) 134 if ($grandChild -> nodeType == XML_ELEMENT_NODE)
@@ -185,26 +184,7 @@ class AmdaAction @@ -185,26 +184,7 @@ class AmdaAction
185 $info = $id; 184 $info = $id;
186 } 185 }
187 break; 186 break;
188 -  
189 -// case 'alias':  
190 -// $info = $id;  
191 -// $id = 'alias_'.$id;  
192 -// $component_info = array();  
193 -// if ($child->hasAttribute("index1"))  
194 -// $component_info["index1"] = $child->getAttribute('index1');  
195 -// if ($child->hasAttribute("index2"))  
196 -// $component_info["index2"] = $child->getAttribute('index2');  
197 -//  
198 -// if ($child->hasAttribute("parentId"))  
199 -// $component_info["parentId"] = $child->getAttribute("parentId");  
200 -//  
201 -// if ($child->hasAttribute("iconCls"))  
202 -// $iconCls = $child->getAttribute("iconCls");  
203 -//  
204 -// if ($isLeaf) $isParameter = true;  
205 -//  
206 -// break;  
207 - 187 +
208 case 'timeTable': 188 case 'timeTable':
209 case 'catalog': 189 case 'catalog':
210 if ($isLeaf) $info = $child->getAttribute('intervals').' intervals'; 190 if ($isLeaf) $info = $child->getAttribute('intervals').' intervals';
@@ -217,7 +197,7 @@ class AmdaAction @@ -217,7 +197,7 @@ class AmdaAction
217 $info = '<b>Nb intervals:</b> '.$child->getAttribute('nbIntervals').'<br/>'; 197 $info = '<b>Nb intervals:</b> '.$child->getAttribute('nbIntervals').'<br/>';
218 $info .= '<b>Shared by:</b> '.$child->getAttribute('sharedBy').' ('.$child->getAttribute('sharedDate').')<br/>'; 198 $info .= '<b>Shared by:</b> '.$child->getAttribute('sharedBy').' ('.$child->getAttribute('sharedDate').')<br/>';
219 $info .= '<b>Description:</b> '.$child->getAttribute('description'); 199 $info .= '<b>Description:</b> '.$child->getAttribute('description');
220 - } 200 + }
221 break; 201 break;
222 case 'derivedParam': 202 case 'derivedParam':
223 $info = $child->getAttribute('buildchain'); 203 $info = $child->getAttribute('buildchain');
@@ -355,7 +335,7 @@ class AmdaAction @@ -355,7 +335,7 @@ class AmdaAction
355 'is2dSpectra' => $is2dSpectra,'isStack' => $isStack, 'needsArgs' => $needsArgs, 'help' => $help, 'notyet' => $not_yet); 335 'is2dSpectra' => $is2dSpectra,'isStack' => $isStack, 'needsArgs' => $needsArgs, 'help' => $help, 'notyet' => $not_yet);
356 } 336 }
357 else { 337 else {
358 - if ($child->tagName == 'mission' || $child->tagName == 'observatory') { 338 + if ($child->hasAttribute('rank')) {
359 $rank = $child->getAttribute('rank'); 339 $rank = $child->getAttribute('rank');
360 } 340 }
361 341