diff --git a/php/classes/AmdaAction.php b/php/classes/AmdaAction.php index 179a5e5..91d8d67 100644 --- a/php/classes/AmdaAction.php +++ b/php/classes/AmdaAction.php @@ -129,7 +129,6 @@ class AmdaAction if ($child->nodeType == XML_ELEMENT_NODE) { $isLeaf = true; - if ($child->hasChildNodes()) foreach ($child->childNodes as $grandChild) if ($grandChild -> nodeType == XML_ELEMENT_NODE) @@ -185,26 +184,7 @@ class AmdaAction $info = $id; } break; - -// case 'alias': -// $info = $id; -// $id = 'alias_'.$id; -// $component_info = array(); -// if ($child->hasAttribute("index1")) -// $component_info["index1"] = $child->getAttribute('index1'); -// if ($child->hasAttribute("index2")) -// $component_info["index2"] = $child->getAttribute('index2'); -// -// if ($child->hasAttribute("parentId")) -// $component_info["parentId"] = $child->getAttribute("parentId"); -// -// if ($child->hasAttribute("iconCls")) -// $iconCls = $child->getAttribute("iconCls"); -// -// if ($isLeaf) $isParameter = true; -// -// break; - + case 'timeTable': case 'catalog': if ($isLeaf) $info = $child->getAttribute('intervals').' intervals'; @@ -217,7 +197,7 @@ class AmdaAction $info = 'Nb intervals: '.$child->getAttribute('nbIntervals').'
'; $info .= 'Shared by: '.$child->getAttribute('sharedBy').' ('.$child->getAttribute('sharedDate').')
'; $info .= 'Description: '.$child->getAttribute('description'); - } + } break; case 'derivedParam': $info = $child->getAttribute('buildchain'); @@ -355,7 +335,7 @@ class AmdaAction 'is2dSpectra' => $is2dSpectra,'isStack' => $isStack, 'needsArgs' => $needsArgs, 'help' => $help, 'notyet' => $not_yet); } else { - if ($child->tagName == 'mission' || $child->tagName == 'observatory') { + if ($child->hasAttribute('rank')) { $rank = $child->getAttribute('rank'); } -- libgit2 0.21.2