Revision 64cfdac1
Added by Andreas Kohlbecker about 3 years ago
| modules/cdm_dataportal/cdm_dataportal.module | ||
|---|---|---|
| 2664 | 2664 |
$nameStr = trim($nameStr); |
| 2665 | 2665 |
|
| 2666 | 2666 |
if ($nameStr) {
|
| 2667 |
if(isset($taxonNodeDTO->status_symbol)){
|
|
| 2668 |
$nameStr = $taxonNodeDTO->status_symbol . ' ' . $nameStr;
|
|
| 2667 |
if(isset($taxonNodeDTO->nodeStatus->symbol)){
|
|
| 2668 |
$nameStr = $taxonNodeDTO->nodeStatus->symbol . ' ' . $nameStr;
|
|
| 2669 | 2669 |
} |
| 2670 | 2670 |
// Do not return short names for these. |
| 2671 | 2671 |
if ($taxonNodeDTO->unplaced || $taxonNodeDTO->excluded) {
|
| ... | ... | |
| 2714 | 2714 |
|
| 2715 | 2715 |
if ($taxon->class == "Taxon" && isset($taxonNodes)) {
|
| 2716 | 2716 |
foreach ($taxonNodes as $node) {
|
| 2717 |
if (isset($node->classification)){
|
|
| 2718 |
if(is_object($node->classification)) {
|
|
| 2719 |
if ($node->classification->uuid == $defaultTreeUuid) {
|
|
| 2720 |
return TRUE; |
|
| 2721 |
} |
|
| 2717 |
if (isset($node->classificationUUID)){
|
|
| 2718 |
if ($node->classificationUUID == $defaultTreeUuid) {
|
|
| 2719 |
return TRUE; |
|
| 2722 | 2720 |
} |
| 2723 |
else {
|
|
| 2724 |
if ($node->classification == $defaultTreeUuid) {
|
|
| 2725 |
return TRUE;
|
|
| 2726 |
}
|
|
| 2721 |
}
|
|
| 2722 |
else {
|
|
| 2723 |
if ($node->classification == $defaultTreeUuid) {
|
|
| 2724 |
return TRUE;
|
|
| 2727 | 2725 |
} |
| 2728 | 2726 |
} |
| 2729 | 2727 |
} |
Also available in: Unified diff
switching portal to real TaxonNodeDTOs