| /trunk/services/modules/0.1/bdtfx/CommunNomsTaxons.php |
|---|
| 334,12 → 334,14 |
| } |
| protected function ajouterChampsPersonnalises($champs, $reponse_id) { |
| $champs_a_libeller = array('nom_retenu', 'rang', 'basionyme', 'hybride', 'hybride.parent_01', |
| 'hybride.parent_02', 'presence', 'tax_sup', 'statut_origine', 'statut_culture', 'statut_introduction'); |
| if (! is_null($champs) && is_array($champs) && count($champs) > 0) { |
| foreach ($champs as $champ) { |
| if ($this->verifierValiditeChamp($champ)) { |
| if (strrpos($champ, '.*') !== false) { |
| $this->afficherPointEtoile($champ, $reponse_id); |
| } elseif (strrpos($champ, '.') === false) { |
| } elseif (in_array($champ, $champs_a_libeller)) { |
| $this->table_retour[$champ.'.libelle'] = (isset($reponse_id[$champ])) ? $reponse_id[$champ] : null; |
| } else { |
| $champ = $this->trouverChampBddCorrespondant($champ); |
| 656,7 → 658,7 |
| } elseif ($this->correspondAUnId($champ) || $champ == 'id') { |
| $nom = $this->recupererNomSci($valeur); |
| if ($nom != array()) { |
| $this->table_retour[$champ] = $nom['nom_sci']; |
| $this->table_retour[$champ.'.libelle'] = $nom['nom_sci']; |
| $this->table_retour[$champ.'_html'] = $nom['nom_sci_html']; |
| $this->table_retour[$champ.'_complet'] = $nom['nom_sci_complet']; |
| $this->table_retour[$champ.'_html_complet'] = $nom['nom_sci_complet_html']; |
| 663,7 → 665,7 |
| $this->service_href = $nom['service']; |
| } |
| } elseif ($this->correspondAUnCode($champ)) { |
| $this->table_retour[$champ] = $this->ajouterSignificationCode($champ, $valeur); |
| $this->table_retour[$champ.'.libelle'] = $this->ajouterSignificationCode($champ, $valeur); |
| } |
| } |
| /trunk/services/modules/0.1/bdtfx/Noms.php |
|---|
| 437,7 → 437,7 |
| return $retour_id_hom; |
| } |
| public function obtenirSynonymesParNumNomAvecInfosFlore($num_nom, $version='1_01') { |
| public function obtenirSynonymesParNumNomAvecInfosFlore($num_nom, $version='1_02') { |
| $champs_flore = 'flore_bonnier_num, flore_bonnier_rem,'. |
| 'flore_cnrs_num, flore_cnrs_rem '. |
| 447,10 → 447,10 |
| 'flore_fournier_num, flore_fournier_rem'; |
| $requete = 'SELECT num_nom, nom_sci, '.$champs_flore.' '. |
| 'FROM bdtfx_v'.$version.' '. |
| 'FROM '.$this->table.' '. |
| 'WHERE num_nom_retenu = '. |
| '('. |
| 'SELECT num_nom_retenu FROM bdtfx_v'.$version.' WHERE num_nom = "'.$num_nom.'"'. |
| 'SELECT num_nom_retenu FROM '.$this->table.' WHERE num_nom = "'.$num_nom.'"'. |
| ')'; |
| return $this->getBdd()->recupererTous($requete); |
| /trunk/services/configurations/config_bdtfx.ini |
|---|
| 64,7 → 64,7 |
| num_meme_type = num_meme_type, |
| type_synonymie = type_synonymie, |
| doute_nom_valide = doute_nom_valide, |
| hybride = hybride, |
| hybride = hybride.libelle, |
| in_auteur = in_auteur, |
| statut = statut, |
| nom_complet = nom_complet, |
| 110,15 → 110,15 |
| num_tax_sup=tax_sup.id, |
| rang=rang.code, |
| nom_sci=nom_sci, |
| nom_supra_generique=nom_sci.supra_generique, |
| genre=nom_sci.genre, |
| epithete_infra_generique=nom_sci.infra_generique, |
| epithete_sp=nom_sci.sp, |
| type_epithete=nom_sci.type_epithete, |
| epithete_infra_sp=nom_sci.infra_sp, |
| cultivar_groupe=nom_sci.cultivar_groupe, |
| cultivar=nom_sci.cultivar, |
| nom_commercial=nom_sci.nom_commercial, |
| nom_supra_generique=nom_supra_generique, |
| genre=genre, |
| epithete_infra_generique=epithete_infra_generique, |
| epithete_sp=epithete_sp, |
| type_epithete=type_epithete, |
| epithete_infra_sp=epithete_infra_sp, |
| cultivar_groupe=cultivar_groupe, |
| cultivar=cultivar, |
| nom_commercial=nom_commercial, |
| auteur=auteur, |
| annee=annee, |
| biblio_origine=biblio_origine, |