Project

General

Profile

« Previous | Next » 

Revision 80165c60

Added by Alex Theys about 12 years ago

AT: committing fixes post UAT

View differences:

5.x/themes/palmweb_2/template.php
85 85
function palmweb_2_cdm_feature_nodesTOC($featureNodes){
86 86

  
87 87
  $out .= '<ul>';
88
  $countFeatures = 0;
88 89
  $numberOfChildren = count(cdm_ws_get(CDM_WS_PORTAL_TAXONOMY_CHILDNODES_OF_TAXON, array (get_taxonomictree_uuid_selected(), substr(strrchr($_GET["q"], '/'), 1))));
89 90
  if ($numberOfChildren != 0) {
90 91
 	 $out .= '<li>'.l(t(theme('cdm_feature_name', 'Number of Species')), $_GET['q'], array("class"=>"toc"), NULL, generalizeString('Number Of Species')).'</li>';
......
96 97
      $featureRepresentation = isset($node->feature->representation_L10n) ? $node->feature->representation_L10n : 'Feature';
97 98
      // HACK to implement images for taxa, should be removed
98 99
      if($node->feature->uuid != UUID_IMAGE){
100
      	$countFeatures++;
99 101
        $out .= '<li>'.l(t(theme('cdm_feature_name', $featureRepresentation)), $_GET['q'], array("class"=>"toc"), NULL, generalizeString($featureRepresentation)).'</li>';
100 102
      }
101 103
    }
102 104
  }
103 105
  //Setting the Anchor to the Bibliography section if the option is enabled
104 106
  $show_bibliography = variable_get('cdm_show_bibliography', 1);
105
  if ($show_bibliography) {
107
  
108
  if ($show_bibliography && $countFeatures != 0) {
106 109
  	$out .= '<li>'.l(t(theme('cdm_feature_name', 'Bibliography')), $_GET['q'], array("class"=>"toc"), NULL, generalizeString('Bibliography')).'</li>';
107 110
  }
108 111
  $out .= '</ul>';
......
114 117
  $gallery_settings = getGallerySettings(CDM_DATAPORTAL_DESCRIPTION_GALLERY_NAME);
115 118
  //Creating an array to place the description elements in 
116 119
  $bibliographyOut = array();
117
  //print_r($taxon);
120
  $countFeatures = 0;
118 121
  $numberOfChildren = count(cdm_ws_get(CDM_WS_PORTAL_TAXONOMY_CHILDNODES_OF_TAXON, array (get_taxonomictree_uuid_selected(), $taxon->uuid)));
119 122
  if ($numberOfChildren != 0) {
120 123
  	$out .= '<a name="number_of_species"> </a><H2>Number of Species</H2><div class="content"> <ul class="description">';
......
133 136
  	  }
134 137
      $media_list = array();
135 138
      if($node->feature->uuid != UUID_IMAGE) {
139
      	$countFeatures++;
136 140
        $block->delta = generalizeString($featureRepresentation);
137 141
        $block->subject = '<span class="'. html_class_atttibute_ref($node->feature) . '">' . theme('cdm_feature_name', $featureRepresentation) . '</span>';
138 142
        $block->module = "cdm_dataportal-feature";
......
250 254
 
251 255
	
252 256
  $show_bibliography = variable_get('cdm_show_bibliography', 1);
253
  if ($show_bibliography) {
257
  if ($show_bibliography && $countFeatures !=0) {
254 258
  	$out .= theme('cdm_descriptionElementBibliography', $bibliographyOut);
255 259
  }
256 260

  
......
341 345
}
342 346

  
343 347
function formatReference_for_Bibliogrpahy($references) {
344
	$out = '<a name="bibliography"> </a><H2>Bibliography</H2><div class="content"> <ul class="description">';
345
	foreach ($references as $reference) {
348
	    $out = '<a name="bibliography"> </a><H2>Bibliography</H2><div class="content"> <ul class="description">';
349
    $outTemp= array();
350
  foreach ($references as $reference) {
351
    $referenceString = '';
346 352
		//print_r($reference);
347 353
		switch ($reference->citation->type) {
348 354
			case "Journal":
349
				$out .= "<li class=\"descriptionText DescriptionElement\">";
355
				$referenceString .= "<li class=\"descriptionText DescriptionElement\">";
350 356
				$numberOfTeamMembers = count($reference->citation->authorTeam->teamMembers);
351 357
				$currentRecord = 1;
352 358
				if (!empty($reference->citation->authorTeam->teamMembers)) {
353 359
					foreach ($reference->citation->authorTeam->teamMembers as $teamMember) {
354 360
						if(!empty($teamMember->lastname)) {
355 361
							if ($currentRecord == 1) {
356
								$out .= $teamMember->lastname . ", " . $teamMember->firstname;
362
								$referenceString .= $teamMember->lastname . ", " . $teamMember->firstname;
357 363
							}
358 364
							else if ($numberOfTeamMembers != $currentRecord) {
359
								$out .= " , " . $teamMember->lastname . ", " . $teamMember->firstname;	
365
								$referenceString .= " , " . $teamMember->lastname . ", " . $teamMember->firstname;	
360 366
							}
361 367
							else {
362
								$out .= " & " . $teamMember->lastname . ", " . $teamMember->firstname;
363
								$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? ' ' : ". ");
368
								$referenceString .= " & " . $teamMember->lastname . ", " . $teamMember->firstname;
369
								$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? ' ' : ". ");
364 370
							}
365 371
							$currentRecord += 1;
366 372
						}
367 373
						else {
368 374
							if ($numberOfTeamMembers != $currentRecord) {
369
								$out .= $teamMember->titleCache. " & ";	
375
								$referenceString .= $teamMember->titleCache. " & ";	
370 376
							}
371 377
							else {
372
								$out .= $teamMember->titleCache;
373
								$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? ' ' : ". ");
378
								$referenceString .= $teamMember->titleCache;
379
								$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? ' ' : ". ");
374 380
							}
375 381
							$currentRecord += 1;
376 382
						}
377 383
					}
378 384
				}
379 385
				else {
380
					$out .= $reference->citation->authorTeam->titleCache;
381
					$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? " " : ". ");
386
					$referenceString .= $reference->citation->authorTeam->titleCache;
387
					$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? " " : ". ");
382 388
				}
383 389
				/*else {
384
					$out .= $teamMember->lastname . ", " . $teamMember->firstname . " ";
390
					$referenceString .= $teamMember->lastname . ", " . $teamMember->firstname . " ";
385 391
				}*/
386 392
				if (!empty($reference->citation->datePublished->start)) {
387
					$out .= substr($reference->citation->datePublished->start,0,4);
388
					$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
393
					$referenceString .= substr($reference->citation->datePublished->start,0,4);
394
					$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
389 395
				}
390
				$out .= $reference->citation->title . ". " . $reference->citation->publisher;
391
				$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
392
				$out .= "</li>";
396
				$referenceString .= $reference->citation->title . ". " . $reference->citation->publisher;
397
				$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
398
				$referenceString .= "</li>";
393 399
				break;
394 400
				
395 401

  
396 402
			case "Article":
397
				$out .= "<li class=\"descriptionText DescriptionElement\">";
403
				$referenceString .= "<li class=\"descriptionText DescriptionElement\">";
398 404
				$numberOfTeamMembers = count($reference->citation->authorTeam->teamMembers);
399 405
				$currentRecord = 1;
400 406
				if (!empty($reference->citation->authorTeam->teamMembers)) {
401 407
					foreach ($reference->citation->authorTeam->teamMembers as $teamMember) {
402 408
						if(!empty($teamMember->lastname)) {
403 409
							if ($currentRecord == 1) {
404
								$out .= $teamMember->lastname . ", " . $teamMember->firstname;
410
								$referenceString .= $teamMember->lastname . ", " . $teamMember->firstname;
405 411
							}
406 412
							else if ($numberOfTeamMembers != $currentRecord) {
407
								$out .= " , " . $teamMember->lastname . ", " . $teamMember->firstname;	
413
								$referenceString .= " , " . $teamMember->lastname . ", " . $teamMember->firstname;	
408 414
							}
409 415
							else {
410
								$out .= " & " . $teamMember->lastname . ", " . $teamMember->firstname;
411
								$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? ' ' : ". ");
416
								$referenceString .= " & " . $teamMember->lastname . ", " . $teamMember->firstname;
417
								$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? ' ' : ". ");
412 418
							}
413 419
							$currentRecord += 1;
414 420
						}
415 421
						else {
416 422
							if ($numberOfTeamMembers != $currentRecord) {
417
								$out .= $teamMember->titleCache. " & ";	
423
								$referenceString .= $teamMember->titleCache. " & ";	
418 424
							}
419 425
							else {
420
								$out .= $teamMember->titleCache;
421
								$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? ' ' : ". ");
426
								$referenceString .= $teamMember->titleCache;
427
								$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? ' ' : ". ");
422 428
							}
423 429
							$currentRecord += 1;
424 430
						}
425 431
					}
426 432
				}
427 433
				else {
428
					$out .= $reference->citation->authorTeam->titleCache;
429
					$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? " " : ". ");
434
					$referenceString .= $reference->citation->authorTeam->titleCache;
435
					$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? " " : ". ");
430 436
				}
431 437
				/*else {
432
					$out .= $teamMember->lastname . ", " . $teamMember->firstname . " ";
438
					$referenceString .= $teamMember->lastname . ", " . $teamMember->firstname . " ";
433 439
				}*/
434 440
				if (!empty($reference->citation->datePublished->start)) {
435
					$out .= substr($reference->citation->datePublished->start,0,4);
436
					$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
441
					$referenceString .= substr($reference->citation->datePublished->start,0,4);
442
					$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
437 443
				}
438
				$out .= $reference->citation->title . ". " . $reference->citation->publisher;
439
				$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
440
				$out .= "</li>";
444
				$referenceString .= $reference->citation->title . ". " . $reference->citation->publisher;
445
				$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
446
				$referenceString .= "</li>";
441 447
				break;
442 448
				
443 449
				
444 450
			case "Book":
445
				$out .= "<li class=\"descriptionText DescriptionElement\">";
451
				$referenceString .= "<li class=\"descriptionText DescriptionElement\">";
446 452
				$numberOfTeamMembers = count($reference->citation->authorTeam->teamMembers);
447 453
				$currentRecord = 1;
448 454
				if (!empty($reference->citation->authorTeam->teamMembers) || $reference->citation->authorTeam->titleCache != "-empty team-") {
449 455
					foreach ($reference->citation->authorTeam->teamMembers as $teamMember) {
450 456
						if(!empty($teamMember->lastname)) {
451 457
							if ($numberOfTeamMembers != $currentRecord) {
452
								$out .= $teamMember->lastname . ", " . $teamMember->firstname. " & ";	
458
								$referenceString .= $teamMember->lastname . ", " . $teamMember->firstname. " & ";	
453 459
							}
454 460
							else {
455
								$out .= $teamMember->lastname . ", " . $teamMember->firstname;
456
								$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
461
								$referenceString .= $teamMember->lastname . ", " . $teamMember->firstname;
462
								$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
457 463
							}
458 464
							$currentRecord += 1;
459 465
						}
460 466
						else {
461 467
							if ($numberOfTeamMembers != $currentRecord) {
462
								$out .= $teamMember->titleCache. " & ";	
468
								$referenceString .= $teamMember->titleCache. " & ";	
463 469
							}
464 470
							else {
465
								$out .= $teamMember->titleCache;
466
								$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
471
								$referenceString .= $teamMember->titleCache;
472
								$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
467 473
							}
468 474
							$currentRecord += 1;
469 475
						}
......
472 478
					
473 479
				}
474 480
				else if ($reference->citation->authorTeam->titleCache != "-empty team-"){
475
					$out .= $reference->citation->authorTeam->titleCache;
476
					$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
481
					$referenceString .= $reference->citation->authorTeam->titleCache;
482
					$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
477 483
				}
478 484
				 else {
479 485
				 	$isCitationTitleCache  = true;
480
				 	$out .=  $reference->citation->titleCache;
486
				 	$referenceString .=  $reference->citation->titleCache;
481 487
				 }
482 488
				if (!empty($reference->citation->datePublished->start)) {
483
					$out .= substr($reference->citation->datePublished->start,0,4);
484
					$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
489
					$referenceString .= substr($reference->citation->datePublished->start,0,4);
490
					$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
485 491
				}
486 492
				if ($isCitationTitleCache == false && !empty($reference->citation->title)) {
487
					$out .= $reference->citation->title; 
488
					$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
493
					$referenceString .= $reference->citation->title; 
494
					$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
489 495
				}
490 496
				if (!empty($reference->citation->publisher)) {
491
					$out .= $reference->citation->publisher;
492
					$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
497
					$referenceString .= $reference->citation->publisher;
498
					$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
493 499
				}
494
				$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
495
				$out .= "</li>";
500
				$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
501
				$referenceString .= "</li>";
496 502
				break;
497 503
			case "BookSection":
498
				$out .= "<li class=\"descriptionText DescriptionElement\">";
504
				$referenceString .= "<li class=\"descriptionText DescriptionElement\">";
499 505
				$numberOfTeamMembers = count($reference->citation->authorTeam->teamMembers);
500 506
				$currentRecord = 1;
501 507
				if (!empty($reference->citation->authorTeam->teamMembers)) {
502 508
					foreach ($reference->citation->authorTeam->teamMembers as $teamMember) {
503 509
						if(!empty($teamMember->lastname)) {
504 510
							if ($numberOfTeamMembers != $currentRecord) {
505
								$out .= $teamMember->lastname . ", " . $teamMember->firstname. " & ";	
511
								$referenceString .= $teamMember->lastname . ", " . $teamMember->firstname. " & ";	
506 512
							}
507 513
							else {
508
								$out .= $teamMember->lastname . ", " . $teamMember->firstname;
509
								$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
514
								$referenceString .= $teamMember->lastname . ", " . $teamMember->firstname;
515
								$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
510 516
							}
511 517
							$currentRecord += 1;
512 518
						}
513 519
						else {
514 520
							if ($numberOfTeamMembers != $currentRecord) {
515
								$out .= $teamMember->titleCache. " & ";	
521
								$referenceString .= $teamMember->titleCache. " & ";	
516 522
							}
517 523
							else {
518
								$out .= $teamMember->titleCache;
519
								$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
524
								$referenceString .= $teamMember->titleCache;
525
								$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
520 526
							}
521 527
							$currentRecord += 1;
522 528
						}
523 529
					}
524 530
				}
525
				$out .= substr($reference->citation->inReference->datePublished->start,0,4) . ". " . $reference->citation->title . ". " . "Pages ". $reference->citation->pages . ". In ";
531
				$referenceString .= substr($reference->citation->inReference->datePublished->start,0,4) . ". " . $reference->citation->title . ". " . "Pages ". $reference->citation->pages . ". In ";
526 532
				$numberOfTeamMembersInReference = count($reference->citation->inReference->authorTeam->teamMembers);
527 533
				$currentRecordinReference = 1;
528 534
				if (!empty($reference->citation->inReference->authorTeam->teamMembers)) {
529 535
					foreach ($reference->citation->inReference->authorTeam->teamMembers as $teamMember) {
530 536
						if(!empty($teamMember->lastname)) {
531 537
							if ($numberOfTeamMembers != $currentRecord) {
532
								$out .= $teamMember->lastname . ", " . $teamMember->firstname. " & ";	
538
								$referenceString .= $teamMember->lastname . ", " . $teamMember->firstname. " & ";	
533 539
							}
534 540
							else {
535
								$out .= $teamMember->lastname . ", " . $teamMember->firstname;
536
								$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
541
								$referenceString .= $teamMember->lastname . ", " . $teamMember->firstname;
542
								$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
537 543
							}
538 544
							$currentRecord += 1;
539 545
						}
540 546
						else {
541 547
							if ($numberOfTeamMembers != $currentRecord) {
542
								$out .= $teamMember->titleCache. " & ";	
548
								$referenceString .= $teamMember->titleCache. " & ";	
543 549
							}
544 550
							else {
545
								$out .= $teamMember->titleCache;
546
								$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
551
								$referenceString .= $teamMember->titleCache;
552
								$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
547 553
							}
548 554
							$currentRecord += 1;
549 555
						}
550 556
					}
551 557
				}
552 558
				
553
				$out .= $reference->citation->inReference->title . ". " . $reference->citation->inReference->publisher . ". " . $reference->citation->inReference->placePublished;
554
				$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
559
				$referenceString .= $reference->citation->inReference->title . ". " . $reference->citation->inReference->publisher . ". " . $reference->citation->inReference->placePublished;
560
				$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
555 561
					
556 562
				
557
				$out .= "</li>";
563
				$referenceString .= "</li>";
558 564
				break;
559 565
				
560 566
				
561 567
			case "WebPage" :
562
				$out .= "<li class=\"descriptionText DescriptionElement\">" . $reference->citation->titleCache . "</li>";
568
				$referenceString .= "<li class=\"descriptionText DescriptionElement\">" . $reference->citation->titleCache . "</li>";
563 569
				break;
564 570
			case "Generic" :
565
				$out .= "<li class=\"descriptionText DescriptionElement\">";
571
				$referenceString .= "<li class=\"descriptionText DescriptionElement\">";
566 572
				$numberOfTeamMembers = count($reference->citation->authorTeam->teamMembers);
567 573
				$currentRecord = 1;
568 574
				if (!empty($reference->citation->authorTeam->teamMembers)) {
569 575
					foreach ($reference->citation->authorTeam->teamMembers as $teamMember) {
570 576
						if(!empty($teamMember->lastname)) {
571 577
							if ($currentRecord == 1) {
572
								$out .= $teamMember->lastname . ", " . $teamMember->firstname;
578
								$referenceString .= $teamMember->lastname . ", " . $teamMember->firstname;
573 579
							}
574 580
							else if ($numberOfTeamMembers != $currentRecord) {
575
								$out .= " , " . $teamMember->lastname . ", " . $teamMember->firstname;	
581
								$referenceString .= " , " . $teamMember->lastname . ", " . $teamMember->firstname;	
576 582
							}
577 583
							else {
578
								$out .= " & " . $teamMember->lastname . ", " . $teamMember->firstname;
579
								$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? ' ' : ". ");
584
								$referenceString .= " & " . $teamMember->lastname . ", " . $teamMember->firstname;
585
								$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? ' ' : ". ");
580 586
							}
581 587
							$currentRecord += 1;
582 588
						}
583 589
						else {
584 590
							if ($numberOfTeamMembers != $currentRecord) {
585
								$out .= $teamMember->titleCache. " & ";	
591
								$referenceString .= $teamMember->titleCache. " & ";	
586 592
							}
587 593
							else {
588
								$out .= $teamMember->titleCache;
589
								$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? ' ' : ". ");
594
								$referenceString .= $teamMember->titleCache;
595
								$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? ' ' : ". ");
590 596
							}
591 597
							$currentRecord += 1;
592 598
						}
593 599
					}
594 600
				}
595 601
				else {
596
					$out .= $reference->citation->authorTeam->titleCache;
597
					$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? " " : ". ");
602
					$referenceString .= $reference->citation->authorTeam->titleCache;
603
					$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? " " : ". ");
598 604
				}
599 605
				/*else {
600
					$out .= $teamMember->lastname . ", " . $teamMember->firstname . " ";
606
					$referenceString .= $teamMember->lastname . ", " . $teamMember->firstname . " ";
601 607
				}*/
602 608
				if (!empty($reference->citation->datePublished->start)) {
603
					$out .= substr($reference->citation->datePublished->start,0,4);
604
					$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
609
					$referenceString .= substr($reference->citation->datePublished->start,0,4);
610
					$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
605 611
				}
606
				$out .= $reference->citation->title . ". " . $reference->citation->publisher;
607
				$out .= ((str_endsWith($out, ".") || str_endsWith($out, ". ")) ? "" : ". ");
608
				$out .= "</li>";
612
				$referenceString .= $reference->citation->title . ". " . $reference->citation->publisher;
613
				$referenceString .= ((str_endsWith($referenceString, ".") || str_endsWith($referenceString, ". ")) ? "" : ". ");
614
				$referenceString .= "</li>";
609 615
				break;
610 616
			default:
611 617
				
612 618
				//$author_team = cdm_ws_get(CDM_WS_REFERENCE_AUTHORTEAM, $reference->citation->uuid);
613 619
				
614 620
				/*if(!empty($author_team->titleCache)) {
615
					$out.= print_r($reference->citation);
616
					$out .= '<li class="descriptionText DescriptionElement">' . "<b>" . $reference->citation->title . ":" . "</b>" . $author_team->titleCache .   '</li>';
621
					$referenceString.= print_r($reference->citation);
622
					$referenceString .= '<li class="descriptionText DescriptionElement">' . "<b>" . $reference->citation->title . ":" . "</b>" . $author_team->titleCache .   '</li>';
617 623
				}
618 624
				else {
619
					$out .= '<li class="descriptionText DescriptionElement">' ."<b>" . $reference->citation->titleCache . "</b>" . '</li>';
625
					$referenceString .= '<li class="descriptionText DescriptionElement">' ."<b>" . $reference->citation->titleCache . "</b>" . '</li>';
620 626
				}
621 627
				if ($referenceCitation){
622 628
					$sourceRefs = $referenceCitation;
623
					//$out .= "[titleccache] " . $descriptionElementBiblio->feature->titleCache . "[/titlecache]";
624
					//$out .= "[Class] " . $descriptionElementBiblio->class . "[/class]";
625
					//$out .= "[sourceref]" . $sourceRefs . "[/sourceRef]";
629
					//$referenceString .= "[titleccache] " . $descriptionElementBiblio->feature->titleCache . "[/titlecache]";
630
					//$referenceString .= "[Class] " . $descriptionElementBiblio->class . "[/class]";
631
					//$referenceString .= "[sourceref]" . $sourceRefs . "[/sourceRef]";
626 632
				}*/
627 633
				break;
628 634
		}
635
		$outTemp[] = $referenceString;
636
	}
637
	sort($outTemp);
638
  	
639
	foreach ($outTemp as $refString) {
640
		$out .= $refString;
629 641
	}
642
	
630 643
	$out .= "</ul></div>";
631 644
	return $out;
632 645
}
......
661 674
	}
662 675
	//artist
663 676
	if($media_metadata['artist'] && $doArtist) {
664
		$out .= '<dt class = "artist">' . t('Artist') . '</dt> <dd class = "astist">' . $media_metadata['artist'] . '</dd>';
677
		$out .= '<dt class = "artist">' . t('Artist') . '</dt> <dd class = "astist">' . str_replace("'","", $media_metadata['artist']) . '</dd>';
665 678
	}
666 679
	//location
667 680
	if($doLocation){
......
744 757

  
745 758
  if($doLink){
746 759
    $out = l('<span class="reference">'.$citation.'</span>'
747
    , path_to_reference($reference->uuid)
760
   	, path_to_reference($reference->uuid) 
761
    //, $_GET['q']
748 762
    , array("class"=>"reference")
763
    //, NULL, generalizeString('Bibliography'), FALSE ,TRUE);
749 764
    , NULL, NULL, FALSE ,TRUE);
750 765
  } else {
751 766
    $out = '<span class="reference">'.$citation.'</span>';
......
759 774
}
760 775

  
761 776

  
777
/*function palmweb_2_cdm_reference_page($referenceTO){
778
	//print_r($referenceTO);
779
	$author_team = cdm_ws_get(CDM_WS_REFERENCE_AUTHORTEAM, $referenceTO->uuid);
780
	$nomenclatural = cdm_ws_get('portal/taxon/$0/descriptions', '1d91bd71-7109-4916-872f-a82b710a9cdf');
781
	
782
	print_r($nomenclatural);
783
	return "TOTO";
784
}*/
785

  
786

  
762 787
/**
763 788
 * Sets the body-tag class attribute.
764 789
 *

Also available in: Unified diff