Subversion Repositories eFlore/Projets.eflore-projets

Rev

Rev 661 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 661 Rev 872
Line 70... Line 70...
70 
		$nomSciHtml .= $this->verifierHybridite($this->compo_nom['epithete_infra_sp'], 'infra-sp');
 70 
		$nomSciHtml .= $this->verifierHybridite($this->compo_nom['epithete_infra_sp'], 'infra-sp');
71 
		$nomSciHtml .= $this->ajouterCultivarGpComm();
 71 
		$nomSciHtml .= $this->ajouterCultivarGpComm();
Line 72... Line 72...
72 
 
 72 
 
73 
		if ($nomSciHtml != '') {
 73 
		if ($nomSciHtml != '') {
- 
 
 74 
			$nomSciHtml = sprintf($this->nomSciTpl, trim($nomSciHtml));
- 
 
 75 
		} else {
74 
			$nomSciHtml = sprintf($this->nomSciTpl, trim($nomSciHtml));
 76 
			$nomSciHtml = $this->verifierHybridite($this->compo_nom['nom_sci'], 'infra-sp');
75 
		}
 77 
		}
76 
		return $nomSciHtml;
 78 
		return $nomSciHtml;
Line 77... Line 79...
77 
	}
 79 
	}
Line 260... Line 262...
260 
				}
 262 
				}
261 
				break;
 263 
				break;
262 
			case 'infra-sp' :
 264 
			case 'infra-sp' :
263 
				foreach ($tab_x as $hyb) {
 265 
				foreach ($tab_x as $hyb) {
264 
					list($gen, $sp, $typeEpithete, $infraSp) = explode (' ', $hyb);
 266 
					list($gen, $sp, $typeEpithete, $infraSp) = explode (' ', $hyb);
- 
 
 267 
					if (isset($infraSp)) {
265 
					$formule_hyb[] = sprintf($this->infraSpFHTpl, $gen, $sp, $this->abbr[$typeEpithete], $typeEpithete, $infraSp);
 268 
						$formule_hyb[] = sprintf($this->infraSpFHTpl, $gen, $sp, $this->abbr[$typeEpithete], $typeEpithete, $infraSp);
- 
 
 269 
					} else {
- 
 
 270 
						$formule_hyb[] = sprintf($this->spFHTpl, $gen, $sp);
- 
 
 271 
					}
266 
				}
 272 
				}
267 
				break;
 273 
				break;
268 
			default : break;
 274 
			default : break;
269 
		}
 275 
		}
270 
		return $this->insererBaliseFormuleHyb(implode(' x ', $formule_hyb));
 276 
		return $this->insererBaliseFormuleHyb(implode(' x ', $formule_hyb));