Subversion Repositories eFlore/Projets.eflore-projets

Compare Revisions

No changes between revisions

Ignore whitespace Rev 1183 → Rev 1191

/branches/v5.12-baouque/services/modules/0.1/sptb/Statuts.php
95,17 → 95,21
}
}
 
private function obtenirLois(Array $id_lois) {
private function obtenirLois(Array $id_lois) {
$id_lois = array_map(array($this->bdd, 'proteger'), $id_lois);
$requete = "SELECT * FROM ".Config::get('bdd_table_lois').' '.
"WHERE id IN (".implode(',',$id_lois).") ";
return $this->bdd->recupererTous($requete);
"WHERE cd_protection IN (".implode(',',$id_lois).") ORDER BY zone_application ASC";
$lois = $this->bdd->recupererTous($requete, 'ASSOC');
foreach ($lois as $loi) {
$retour[$loi['cd_protection']] = $loi;
}
return $retour;
}
private function obtenirLoisZoneGeo(Array $id_lois) {
$id_lois = array_map(array($this->bdd, 'proteger'), $id_lois);
$requete = "SELECT DISTINCT zone_application, code_zone_application FROM ".Config::get('bdd_table_lois').' '.
"WHERE id IN (".implode(',',$id_lois).") ";
"WHERE cd_protection IN (".implode(',',$id_lois).") ORDER BY zone_application ASC";
return $this->bdd->recupererTous($requete);
}
113,7 → 117,7
if ($this->nn_demande != null) {
$conditions_taxons = array();
$conditions_taxons = $this->obtenirNumNomTaxonsSuperieurs(Config::get('referentiel'), $this->nn_demande);
$conditions_taxons[] = $this->bdd->proteger($this->nn_demande);
$conditions_taxons[] = $this->nn_demande;
}
$requete = "SELECT * FROM ".Config::get('bdd_table_especes');
126,7 → 130,7
$requete .= ' -- ' . __FILE__ . ':' . __LINE__;
//echo "REQ: $requete\n";
$statuts = $this->bdd->recuperer($requete);
$statuts = $this->bdd->recupererTous($requete, 'ASSOC');
//echo "STATUTS: " . print_r($statuts, true) . "\n";
//echo "CPT: " . count($statuts) . "\n";
$statuts = $this->formaterRetour($statuts);
135,56 → 139,48
//+---------------------------FONCTIONS DE FORMATAGE---------------------------------------------------------+
 
private function formaterRetour($statuts_taxon) {
switch($this->retour_format) {
case 'zone_geo':
$retour = $this->formaterStatutsTaxonZoneGeo($statuts_taxon);
break;
$retour = "";
if ($statuts_taxon) {
foreach ($statuts_taxon as $nom) {
$f[$nom['cd_protection']][$nom['num_nom']] = $nom['nom_sci'];
$lois_statuts[] = $nom['cd_protection'];
}
switch($this->retour_format) {
case 'zone_geo':
$retour = $this->obtenirLoisZoneGeo($lois_statuts);
break;
case 'nom':
$lois = $this->obtenirLois($lois_statuts);
foreach ($statuts_taxon as $nom) {
$retour[$nom['num_nom']]['num_nom'] = $nom['num_nom'];
$retour[$nom['num_nom']]['nom_sci'] = $nom['nom_sci'];
$retour[$nom['num_nom']]['lois'][$nom['cd_protection']] = $lois[$nom['cd_protection']];
case 'complet':
$retour = $this->formaterStatutsTaxon($statuts_taxon);
break;
}
break;
case 'complet':
$lois = $this->obtenirLois($lois_statuts);
foreach ($lois as $id => $loi) {
$retour[$loi['zone_application']][$id] = $loi;
if (isset($f[$id])) {
foreach ($f[$id] as $num_nom => $nom_sci) {
$retour[$loi['zone_application']][$id]['nom_sci'][$num_nom] = $nom_sci;
}
}
}
break;
default:
$retour = $this->formaterStatutsTaxon();
break;
}
default:
$retour = $this->formaterStatutsTaxon();
break;
}
return $retour;
}
private function formaterStatutsTaxonZoneGeo($statuts_taxon) {
$lois_statuts = array();
// cas ou la requête (obtenirStatuts()) ne retourne rien
if(!$statuts_taxon) return array();
 
foreach ($statuts_taxon as $champ => $statut) {
if($statut == "1") {
$lois_statuts[] = $champ;
}
}
$zones_geo_lois = (!empty($lois_statuts)) ? $this->obtenirLoisZoneGeo($lois_statuts) : array();
return $zones_geo_lois;
}
private function formaterStatutsTaxon($statuts_taxon) {
$statuts_formates = array();
$lois_statuts = array();
if(is_array($statuts_taxon)) {
unset($statuts_taxon['num_nom']);
unset($statuts_taxon['num_nom_retenu']);
unset($statuts_taxon['nom_sci']);
foreach ($statuts_taxon as $champ => $statut) {
if($statut == "1") {
$lois_statuts[] = $champ;
}
}
}
$statuts_formates = (!empty($lois_statuts)) ? $this->obtenirLois($lois_statuts) : array();
return $statuts_formates;
}
}
?>
/branches/v5.12-baouque/services/modules
Property changes:
Modified: svn:mergeinfo
Merged /trunk/services/modules:r1185-1190
/branches/v5.12-baouque/services/configurations/config_sptb.ini
7,8 → 7,8
bdd_nom = "tb_eflore"
 
; Nom de la table principalement utilisée.
bdd_table_especes = "sptb_especes_v2012"
bdd_table_lois = "sptb_lois_v2012"
bdd_table_especes = "sptb_especes_v2014"
bdd_table_lois = "sptb_lois_v2014"
referentiel = "bdtfx"
 
; Nom de la table métadonnées utilisée.
/branches/v5.12-baouque/services/configurations
Property changes:
Modified: svn:mergeinfo
Merged /trunk/services/configurations:r1185-1190
/branches/v5.12-baouque/scripts/modules/sptb/Sptb.php
15,6 → 15,7
$this->chargerStructureSql();
$this->chargerDonnees('especes');
$this->chargerDonnees('lois');
$this-> ajouterChamps();
$this->genererChampNumNomRetenu();
break;
case 'chargerStructureSql' :
23,9 → 24,11
case 'chargerDonnees' :
$this->chargerDonnees('especes');
$this->chargerDonnees('lois');
$this-> ajouterChamps();
$this->genererChampNumNomRetenu();
break;
case 'genererChampNumNomRetenu' :
$this-> ajouterChamps();
$this->genererChampNumNomRetenu();
break;
case 'supprimerTous' :
39,7 → 42,7
}
}
 
private function chargerDonnees($type) {
protected function chargerDonnees($type) {
$chemin = Config::get('chemins.'.$type);
$table = Config::get('tables.'.$type);
$requete = "LOAD DATA INFILE '$chemin' ".
69,6 → 72,14
$this->getBdd()->requeter($requete);
}
}
private function ajouterChamps() {
$table = Config::get('tables.especes');
$requete = 'ALTER TABLE '.$table.' ADD `num_nom` INT( 10 ) NOT NULL ,
ADD `num_nom_retenu` INT( 10 ) NOT NULL ,
ADD `nom_sci` VARCHAR( 70 ) NOT NULL ';
$this->getBdd()->requeter($requete);
}
private function genererNumNomRetenu() {
$table = Config::get('tables.especes');
75,8 → 86,8
$table_referentiel = Config::get('tables.referentielTaxo');
$requete = 'UPDATE '.$table.' s, '.$table_referentiel.' r '.
'SET s.num_nom_retenu = r.num_nom_retenu '.
' WHERE s.num_nom = r.num_nom ';
'SET s.num_nom_retenu = r.num_nom_retenu, s.num_nom = r.num_nom, s.nom_sci = r.nom_sci '.
' WHERE s.cd_nom = r.cd_nom ';
$this->getBdd()->requeter($requete);
}
/branches/v5.12-baouque/scripts/modules/sptb/sptb.ini
1,16 → 1,16
version="2012"
version="2014"
dossierTsv = "{ref:dossierDonneesEflore}sptb/{ref:version}/"
dossierSql = "{ref:dossierTsv}"
 
[tables]
especes = "sptb_especes_v2012"
lois = "sptb_lois_v2012"
referentielTaxo = "bdtfx_v1_02"
especes = "sptb_especes_v2014"
lois = "sptb_lois_v2014"
referentielTaxo = "bdtfx_v3_00"
 
[fichiers]
structureSql = "sptb_v2012.sql"
especes = "sptb_especes_v2012.tsv"
lois = "sptb_lois_v2012.tsv"
structureSql = "sptb_v2014.sql"
especes = "sptb_especes_v2014.tsv"
lois = "sptb_lois_v2014_1.tsv"
 
[chemins]
structureSql = "{ref:dossierSql}{ref:fichiers.structureSql}"
/branches/v5.12-baouque/.
Property changes:
Modified: svn:mergeinfo
Merged /trunk:r1185-1190