/trunk/modules/fiche/Fiche.php |
---|
111,7 → 111,7 |
$donnees['num_tax'] = $this->nom_selectionne->get('num_taxonomique'); |
$donnees['nom_appele_html'] = $this->nom_appele_html; |
$famille = $this->nom_retenu->getTaxonSupRang('180'); |
$donnees['lien_recherche_famille'] = html_entity_decode($this->url->obtenirUrlRechercheAvancee(array("fam" => $famille))); |
$donnees['lien_recherche_famille'] = html_entity_decode($this->url->obtenirUrlRechercheAvancee(array("s" => $famille))); |
$donnees['famille'] = $famille; |
$donnees['lien_recherche_referentiel'] = html_entity_decode($this->url->obtenirUrlBase()); |
$donnees['referentiel'] = $this->parametres['referentiel']; |
119,7 → 119,7 |
$donnees['nom_vernaculaire'] = $verna; |
// moteur de recherche |
$this->executerAction('Recherche', 'executerAccueil', $this->parametres); |
//$this->executerAction('Recherche', 'executerAccueil', $this->parametres); |
// page synthese |
$blocs_niveaux = $this->conteneur->getParametreTableau('blocs_fiche_defaut'); |
151,7 → 151,7 |
$onglet = new $classe($this->conteneur); |
$action = 'obtenir'.ucfirst($_GET['sous_action']); |
$html_ajax = $onglet->$action(); |
header('Content-type : text/html'); |
header('Content-type: text/html; charset=utf-8'); |
echo $html_ajax; |
exit; |
} |
158,10 → 158,11 |
private function formaterLiensNomsHtml($nom_sci_html) { |
$params = array(); |
$classes_recherche = array("fam" => "fam", "gen" => "gen", "sp" => "sp", "infra-sp" => "ssp"); |
$classes_recherche = array("fam" => "s", "gen" => "s", "sp" => "s", "infra-sp" => "s"); |
$doc = new DOMDocument(); |
$doc->loadHTML($nom_sci_html); |
// le deuxième argument permet de ne pas charger de balise supplementaire |
$doc->loadHTML($nom_sci_html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD); |
$spans = $doc->getElementsByTagName('span'); |
$abbrs = $doc->getElementsByTagName('abbr'); |
208,7 → 209,7 |
} |
} |
return $doc->SaveXml(); |
return $doc->SaveHtml(); |
} |
private function formaterLienRechercheSurPartieNomSci(&$noeud, &$params) { |
/trunk/bibliotheque/AppUrls.php |
---|
1,5 → 1,6 |
<?php |
class AppUrls { |
private $urlDomaine = null; |
private $urlBase = null; |
private $urlMobile = null; |
private $urlBaseDossier = null; |
7,7 → 8,8 |
private $urlRedirection = null; |
private $urlPopUp = null; |
public function __construct(Url $urlBase = null, Url $urlBaseDossier = null, Url $urlPopUp = null, Url $urlMobile = null) { |
public function __construct(Url $urlBase = null, Url $urlBaseDossier = null, Url $urlPopUp = null, Url $urlMobile = null, Url $urlDomaine = null) { |
$this->urlDomaine = (is_null($urlDomaine)) ? Registre::get('eFlore.domaine') : $urlDomaine; |
$this->urlBase = (is_null($urlBase)) ? Registre::get('eFlore.urlBase') : $urlBase; |
$this->urlBaseDossier = (is_null($urlBaseDossier)) ? Registre::get('eFlore.urlBaseDossier') : $urlBaseDossier; |
$this->urlPopUp = (is_null($urlPopUp)) ? Registre::get('eFlore.urlPopUp') : $urlPopUp; |
79,11 → 81,8 |
public function getParametresUrlRechercheAvancee() { |
$parametres = array( |
'referentiel' => Registre::get('parametres.referentiel'), |
'niveau' => Registre::get('parametres.niveau'), |
'module' => 'recherche', |
'action' => 'rechercheAvancee', |
'type_nom' => 'nom_scientifique' |
'hFR[referentiels][0]' => Registre::get('parametres.referentiel'), |
'in' => 'flore' |
); |
return $parametres; |
} |
109,8 → 108,8 |
public function obtenirUrlRechercheAvancee($params = array()) { |
$parametres = $this->getParametresUrlRechercheAvancee(); |
$parametres = array_merge($parametres,$params); |
$this->urlBase->setRequete($parametres); |
$url = $this->urlBase->getURL(); |
$this->urlDomaine->setRequete($parametres); |
$url = $this->urlDomaine->getURL(); |
return $url; |
} |
/trunk/controleurs/AppControleur.php |
---|
104,6 → 104,7 |
// "public" pour pouvoir être appelée distinctememnt de "initialiser" lors des tests PHPUnit |
public static function initialiserRegistre() { |
Registre::set('eFlore.domaine', new Url(Config::get('base_url_domaine'))); |
Registre::set('eFlore.urlBase', new Url(Config::get('base_url_application_index'))); |
Registre::set('eFlore.urlBaseDossier', new Url(Config::get('base_url_application'))); |
Registre::set('eFlore.urlCourante', self::getUrlCourante()); |