Project

General

Profile

Revision a3228c59

IDa3228c59232166231840d2d7a8bcfed3dc6af42e
Parent 7ac8c744
Child 8a4d078d

Added by Andreas Kohlbecker over 2 years ago

ref #7565 marking all code to be removed with comments

View differences:

modules/cdm_dataportal/cdm_taxontree/cdm_taxontree.module
385 385
 * @param unknown_type $tid
386 386
 * @param unknown_type $vid
387 387
 * @param unknown_type $theme
388
 *
389
 * * TODO remove method, see #7565
388 390
 */
389 391
function cdm_taxontree_taxonomy_children($tid, $vid, $theme) {
390 392
  $args = func_get_args();
......
403 405
 */
404 406
function cdm_taxontree_get_root($vid = NULL) {
405 407
  if (is_numeric($vid)) {
408
    //  TODO remove case, see #7565
406 409
    // vid, $parent = 0, $depth = -1, $max_depth = NULL) {
407 410
    $terms = taxonomy_get_tree($vid, 0, 1);
408 411
    return cdm_taxontree_terms2treenodes($terms);
......
423 426
function cdm_taxontree_get_children($uuid, $vid = NULL) {
424 427

  
425 428
  if (is_numeric($vid)) {
429
    //  TODO remove case, see #7565
426 430
    $terms = taxonomy_get_children($uuid, $vid);
427 431
    return cdm_taxontree_terms2treenodes($terms);
428 432
  }
......
443 447

  
444 448
  if (!is_uuid($uuid)) {
445 449
    // Using Drupal taxonomy.
450
    //  TODO remove case, see #7565
446 451
    $terms = taxonomy_get_parents($uuid);
447 452
    array_push($terms, taxonomy_term_load($uuid));
448 453
    $terms = array_reverse($terms);
......
473 478
function cdm_taxontree_build_tree($taxonUuid = NULL, $hideOtherConcepts = TRUE, $vid = NULL) {
474 479
  // TODO Remove $hideOtherConcepts from method signature.
475 480
  if (is_null($vid)) {
481
    //  TODO remove case, see #7565
476 482
    if ($taxonUuid) {
477 483
      $taxon = cdm_ws_get(CDM_WS_PORTAL_TAXON, $taxonUuid);
478 484
    }
......
481 487
  }
482 488
  // Valid compact_modes: 'expanded', 'compact', 'flattened'.
483 489
  // Get the root level.
484
  $root_tree = cdm_taxontree_get_root($vid);
490

  
491
  $root_tree = cdm_taxontree_get_root($vid); //  TODO remove $vid, see #7565 ?
485 492
  /*
486 493
  if(!$root_tree || !is_array($root_tree)){
487 494
    return array();

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)