/branches/v5.3-amandaie/services/modules/0.1/moissonnage/cartes/SourceDonnees.php |
---|
113,14 → 113,13 |
private function construireWhereTaxonMoissonnage($source) { |
$nomRang = $this->obtenirNomRang(); |
$criteres = array(); |
$criteres[] = ($source == "baznat" || $source == "ifn") ? |
"num_nom = ".$this->taxon['num_nom'] : |
"nom_scientifique_complet LIKE ".$this->bdd->proteger($this->taxon['nom_sci']) ; |
$nom = ($source == "baznat") ? implode('%',explode(' ',$this->taxon['nom_complet'] )) : $this->taxon['nom_sci'] ; |
$criteres[] = "nom_scientifique_complet LIKE ".$this->bdd->proteger($nom); |
if ($this->nomRang == 'espece' || $this->nomRang == 'sous_espece') { |
foreach ($this->taxons as $sousTaxon) { |
$criteres[] = ($source == "baznat" || $source == "ifn") ? |
"num_nom = ".$sousTaxon['num_nom'] : |
"nom_scientifique_complet LIKE ".$this->bdd->proteger($sousTaxon['nom_sci']) ; |
$nom = ($source == "baznat") ? implode('%',explode(' ',$sousTaxon['nom_complet'] )) : $sousTaxon['nom_sci']; |
$criteres[] = "nom_scientifique_complet LIKE ".$this->bdd->proteger($nom); |
} |
} elseif ($this->nomRang == 'famille') { |
foreach ($this->genres as $genre) { |
/branches/v5.3-amandaie/services/configurations/config_moissonnage.ini |
---|
23,7 → 23,7 |
; Config spécifique au projet |
; Noms des services disponibles pour ce projet |
servicesDispo = "meta-donnees,aide,ontologies,cartes" |
sourcesDonnees = "floradata,sophy,baznat,ifn" |
sourcesDonnees = "floradata,sophy,baznat" |
rangs = "180,220,290,320" |
; referentiels utilises pour les donnees de moissonnage |
/branches/v5.3-amandaie/scripts/modules/moissonnage/moissonnage.ini |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/moissonnage/Moissonnage.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/proj4php.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/proj4phpLongLat.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG21781.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG26912.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG25832.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG31467.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG31468.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG27571.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG27563.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG26591.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG4302.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG2154.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG4181.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG900913.txt |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/GOOGLE.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG4272.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG4139.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG41001.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG102757.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG900913.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG102758.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG27200.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG42304.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/defs/EPSG31370.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/WSProj4PHP_1.0.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/proj4phpCommon.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/nzmg.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/eqdc.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/sinu.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/stere.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/gauss.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/sterea.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/poly.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/aea.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/merc.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/somerc.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/cea.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/cass.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/ortho.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/krovak.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/mill.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/vandg.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/gnom.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/lcc.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/laea.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/equi.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/moll.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/gstmerc.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/utm.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/omerc.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/eqc.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/tmerc.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/projCode/aeqd.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/proj4phpPoint.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/LGPL GNU lesser licence.txt |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/proj4phpDatum.php |
---|
File deleted |
/branches/v5.3-amandaie/scripts/modules/ifn/bibliotheque/proj4php/proj4phpProj.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/Ifn.php |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/scripts/modules/ifn/ifn.ini |
---|
File deleted |
\ No newline at end of file |
/branches/v5.3-amandaie/. |
---|
Property changes: |
Modified: svn:mergeinfo |
Reverse-merged /trunk:r998-1001 |