Subversion Repositories eFlore/Projets.eflore-projets

Compare Revisions

Ignore whitespace Rev 734 → Rev 735

/trunk/services/modules/0.1/moissonnage/cartes/DonneesFloradata.php
37,12 → 37,15
$nomRang = $this->obtenirNomRang($this->taxon);
if ($nomRang == 'famille') {
$criteres[] = "famille=".$this->bdd->proteger($this->taxon['nom_sci']);
} elseif ($nomRang == 'genre') {
$criteres[] = "nom_sel LIKE ".$this->bdd->proteger($this->taxon['nom_sci'].'%');
} else {
$criteres[] = "nt=".$this->taxon['num_taxonomique'];
$taxons = array($this->taxon['num_taxonomique']);
$sousTaxons = $this->recupererSynonymesEtSousEspeces();
foreach ($sousTaxons as $sousTaxon) {
$criteres[] ="nt=".$sousTaxon['num_taxonomique'];
$taxons[] = $sousTaxon['num_taxonomique'];
}
$criteres[] = "nt IN (".implode(',', $taxons).")";
}
return "(".implode(' OR ',array_unique($criteres)).")";
}
/trunk/services/modules/0.1/moissonnage/cartes/DonneesMoissonnage.php
16,7 → 16,6
"AND lieu_station_latitude BETWEEN ".$this->limitesCarte['sud']." AND ".$this->limitesCarte['nord']." ".
"GROUP BY Floor(lieu_station_latitude*10)/10, Floor(lieu_station_longitude*10)/10 ".
"ORDER BY lat DESC, lng ASC";
//echo $requete.'<br>';
return $bdd->recupererTous($requete);
}