Project

General

Profile

« Previous | Next » 

Revision 4fa58f06

Added by Andreas Kohlbecker over 3 years ago

ref #9265 making use of nomenclaturalSource->nomenclaturalCitation

View differences:

modules/cdm_dataportal/includes/name.inc
411 411 
    // [Eckhard]:"Komma nach dem Taxonnamen ist grundsätzlich falsch,
412 412 
    // Komma nach dem Autornamen ist überall dort falsch, wo ein "in" folgt."
413 413 
    if (isset($renderTemplate['referencePart']['reference'])) {
414 
      $microreference = NULL;
415 
      if (isset($renderTemplate['referencePart']['microreference'])&& isset($taxon_name->nomenclaturalSource->citationMicroReference)) {
416 
        $microreference = $taxon_name->nomenclaturalSource->citationMicroReference;
417 
      }
418 
      if(count($nomref_tagged_text) == 0 && isset($taxon_name->nomenclaturalSource->citation->title)){
419 
        $citation = $taxon_name->nomenclaturalSource->citation->title; // using only the title here since the authors are already addded to the string
420 
        if(isset($taxon_name->nomenclaturalSource->citationMicroReference) && $taxon_name->nomenclaturalSource->citationMicroReference){
421 
          $citation .= ': ' . $taxon_name->nomenclaturalSource->citationMicroReference;
422 
        }
414 
      if(count($nomref_tagged_text) == 0 && isset($taxon_name->nomenclaturalSource->nomenclaturalCitation)){
415 
        $citation = $taxon_name->nomenclaturalSource->nomenclaturalCitation;
423 416 
        // Find preceding element of the reference.
424 417 
        $precedingKey = get_preceding_contentElementKey('reference', $renderTemplate);
425 418 
        if (str_beginsWith($citation, ", in")) {
......
434 427 
        $referenceArray['#separator'] = $separator;
435 428 
        $referenceArray['#html'] = '<span class="reference">' . $citation . '</span>' . $registration_markup;
436 429 
      } else {
437 
        // this ist the case for taxon names
430 
        // this is the case for taxon names
438 431 
        $referenceArray['#html'] = cdm_tagged_text_to_markup($nomref_tagged_text);
439 432 
      }
440 433 

  		




  441
  
  
    

  		




  442
  434
  
    
      array_setr('reference', $referenceArray, $renderTemplate);


  		




  443
  435
  
    
    }


  		




  444
  436
  
    

  		












Also available in:  Unified diff