Revision b011743c
Added by Andreas Kohlbecker about 5 years ago
| modules/cdm_dataportal/cdm_api/cdm_api.module | ||
|---|---|---|
| 1619 | 1619 |
|
| 1620 | 1620 |
// 1. scan this level |
| 1621 | 1621 |
foreach ($feature_tree_nodes as $node){
|
| 1622 |
if($node->feature->uuid == $feature_uuid){
|
|
| 1622 |
if($node->term->uuid == $feature_uuid){
|
|
| 1623 | 1623 |
return $node; |
| 1624 | 1624 |
} |
| 1625 | 1625 |
} |
| ... | ... | |
| 1671 | 1671 |
// Append corresponding elements to an additional node field: |
| 1672 | 1672 |
// $node->descriptionElements. |
| 1673 | 1673 |
foreach ($descriptionElements as $element) {
|
| 1674 |
if ($element->feature->uuid == $node->feature->uuid) {
|
|
| 1674 |
if ($element->term->uuid == $node->term->uuid) {
|
|
| 1675 | 1675 |
if (!isset($node->descriptionElements)) {
|
| 1676 | 1676 |
$node->descriptionElements = array(); |
| 1677 | 1677 |
} |
| ... | ... | |
| 2121 | 2121 |
|
| 2122 | 2122 |
foreach ($root_node->childNodes as $feature_node) {
|
| 2123 | 2123 |
$out .= ($out ? $separator : ''); |
| 2124 |
if(!in_array($feature_node->feature->$field_name, $excludes)) {
|
|
| 2125 |
$out .= $feature_node->feature->$field_name;
|
|
| 2124 |
if(!in_array($feature_node->term->$field_name, $excludes)) {
|
|
| 2125 |
$out .= $feature_node->term->$field_name;
|
|
| 2126 | 2126 |
if (is_array($feature_node->childNodes) && count($feature_node->childNodes) > 0) {
|
| 2127 | 2127 |
$childlabels = cdm_featureTree_elements_toString($feature_node, $separator, $field_name); |
| 2128 | 2128 |
if (strlen($childlabels)) {
|
| ... | ... | |
| 2157 | 2157 |
if ($childIndent) {
|
| 2158 | 2158 |
$indent_prefix = $childIndent . $node_char . " "; |
| 2159 | 2159 |
} |
| 2160 |
$options[$featureNode->feature->uuid] = $indent_prefix . $featureNode->feature->representation_L10n;
|
|
| 2160 |
$options[$featureNode->term->uuid] = $indent_prefix . $featureNode->term->representation_L10n;
|
|
| 2161 | 2161 |
if (isset($featureNode->childNodes) && is_array($featureNode->childNodes)) {
|
| 2162 | 2162 |
// Foreach ($featureNode->childNodes as $childNode){
|
| 2163 | 2163 |
$childList = _featureTree_nodes_as_feature_options($featureNode, $node_char, $childIndentStr, $childIndent . $childIndentStr); |
Also available in: Unified diff
ref #8166 adapting to change in FeatureNode property 'feature' becomes 'term'