WebSVN – eFlore/Projets.eflore-projets – Diff – /trunk/services/modules/0.1/baseflor/InformationsBaseflor.php

 <?php
 /**
 * Classe InformationsBaseflor.php permet de faire des requetes de baseflor en fonction d'un référentiel
 *( BDTFX, BDAFX, BDBFX ) et d'un numéro nomenclatural ( différent de 0 ).
 *  fin d'url possibles :
 *  /informations/#bdnt.nn:#num_nomen --> retourne tous les champs pour un BDNT et un num_nomen
 *  /informations/#bdnt.nn:#num_nomen?champs=description --> retourne champs description pour un BDNT et un num_nomen
 *  /informations/#bdnt.nn:#num_nomen?champs=ecologie --> retourne champs ecologiques pour un BDNT et un num_nomen
-*  /informations --> retourne les 10 premiers résultats
-*  /informations?navigation.limite=..&navigation.depart=.. --> retourne les 10 premiers résultats avec limites
+*
+*
 * Encodage en entrée : utf8
 * Encodage en sortie : utf8
 * @package eflore-projets
 * @author Mathilde SALTHUN-LASSALLE <mathilde@tela-botanica.org>
 * @author Delphine CAUQUIL <delphine@tela-botanica.org>
 * @author Jean-Pascal MILCENT <jpm@tela-botanica.org>
 * @license GPL v3 <http://www.gnu.org/licenses/gpl.txt>
 * @license CECILL v2 <http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt>
 * @version 1.0
 * @copyright 1999-2011 Tela Botanica (accueil@tela-botanica.org)
 */
 class InformationsBaseflor extends Commun{
 	protected $table = "";
 	private $format_reponse = 'informations';
 	private $retour_format = 'max';
 	private $champs_ontologiques = array();
 	protected $serviceNom = 'informations';
-	private $Requete;
-	private $Conteneur;
-	private $Requete_assemblage;
 	private $Bdd;
+	private $requete_condition = "";
+	private $champs_recherches = '*';
+	private $resultat_json;
 	public function consulter($ressources, $parametres) {
 		$this->ressources = $ressources;
 		$this->parametres = $parametres;
 		$this->traiterParametres();
-		$this->DefinirTables();
+		$this->definirTables();
 		$this->traiterRessources();
 		$resultats = null;
 		foreach ($this->table_version as $version) {
-			$this->Requete->table = $version;
+			$this->table = $version;
-			$requete = $this->Requete_assemblage->assemblerLaRequete($this->Requete);
+			$requete = $this->assemblerLaRequete();
 			$resultat =  $this->Bdd->recupererTous($requete);
 			$versionResultat = $this->analyserResultat($resultat);
 			if (count($this->table_version) > 1) {
 				$resultats[$version] = $versionResultat;
 			} else {
 				$resultats = $versionResultat;
+			}
+		}
 		return $resultats;
+	}
 	public function __construct(Conteneur $Conteneur) {
-		$this->Conteneur = $Conteneur;
-		$this->Requete = new Requete();
 		$this->Bdd = $Conteneur->getBdd();
-		$this->Requete_assemblage = $Conteneur->getRequetesAssemblage();
+	}
 	public function analyserResultat($resultat) {
 		$versionResultat = null;
 		if ($resultat == '') {
 			$message = 'La requête SQL formée comporte une erreur!';
 			$code = RestServeur::HTTP_CODE_RESSOURCE_INTROUVABLE;
 			throw new Exception($message, $code);
 		} elseif ($resultat) {
 			$versionResultat = $this->retournerResultatFormate($resultat);
+		}
 		return $versionResultat;
+	}
 //+--------------------------traitement ressources ou paramètres  -------------------------------------------+
 	public function traiterParametres() {
 		if (isset($this->parametres) && !empty($this->parametres)) {
 			foreach ($this->parametres as $param => $valeur) {
 				switch ($param) {
 					case 'categorie'  :
 						if ($valeur == "description") {
-							$this->Requete->champs_recherches = "num_nomen, BDNT, chorologie, inflorescence,"
+							$this->champs_recherches = "num_nomen, BDNT, chorologie, inflorescence,"
 								." sexualite, ordre_maturation, "
 								."pollinisation, fruit, dissemination, couleur_fleur, macule, floraison, type_bio, "
 						 		."form_vegetale ";
-							$this->Requete->requete_condition[] = "( chorologie != '' OR inflorescence != '' ".
+							$this->requete_condition[] = "( chorologie != '' OR inflorescence != '' ".
 								"OR  sexualite != '' OR ordre_maturation != '' OR pollinisation != '' ".
 								"OR fruit != '' OR dissemination != '' OR couleur_fleur != '' OR macule != '' ".
 								"OR floraison != '' OR type_bio != '' OR form_vegetale != '' )";
 						}elseif ($valeur == "ecologie") {
-							$this->Requete->champs_recherches = " num_nomen, BDNT, ve_lumiere , ve_temperature,"
+							$this->champs_recherches = " num_nomen, BDNT, ve_lumiere , ve_temperature,"
 								." ve_continentalite, ve_humidite_atmos, ve_humidite_edaph, ve_reaction_sol,"
 								." ve_nutriments_sol, ve_salinite, ve_texture_sol, ve_mat_org_sol, "
 								." vi_lumiere, vi_temperature, vi_continentalite, vi_humidite_edaph,"
 								." vi_reaction_sol, vi_nutriments_sol, vi_salinite ";
-							$this->Requete->requete_condition[] = "( ve_lumiere  != '' OR ve_temperature != '' ".
+							$this->requete_condition[] = "( ve_lumiere  != '' OR ve_temperature != '' ".
 								"OR ve_continentalite != '' OR ve_humidite_atmos != '' ".
 								"OR ve_humidite_edaph != '' OR ve_reaction_sol != '' ".
 								"OR ve_nutriments_sol != '' OR ve_salinite != '' ".
 								"OR ve_texture_sol != '' OR ve_mat_org_sol != '' )";
 						} else {
 							$e = "Valeur de paramètre inconnue pour 'categorie'.";
 							throw new Exception($e, RestServeur::HTTP_CODE_MAUVAISE_REQUETE);
+						}
 						break;
 					case 'retour.format'  :
 						if ($valeur == 'min' || $valeur == 'max') {
 							$this->retour_format = $valeur;
 							break;
 						} else {
 							$e = "Valeur de paramètre inconnue pour 'retour.format'.";
 							throw new Exception($e, RestServeur::HTTP_CODE_MAUVAISE_REQUETE);
+						}
 					case 'version.projet' :
 						$this->traiterVersion($valeur);
 						break;
 					default :
 						$e = 'Erreur dans les parametres de votre requête : </br> Le paramètre " '
 							.$param.' " n\'existe pas.';
 						throw new Exception($e, RestServeur::HTTP_CODE_MAUVAISE_REQUETE);
 						break;
+				}
+			}
+		}
+	}
 	public function traiterRessources() {
 			if(preg_match('/^(.+)\.nn:([0-9]+)$/', $this->ressources[0], $retour)){
 				switch ($retour[1]) {
 					case 'bdtfx' :
-						$this->Requete->requete_condition[] = "num_nomen = ".$retour[2]." AND BDNT = 'BDTFX' ";
+						$this->requete_condition[] = "num_nomen = ".$retour[2]." AND BDNT = 'BDTFX' ";
 						break;
 					case  'bdafx' :
-						$this->Requete->requete_condition[] = "num_nomen = ".$retour[2]." AND BDNT = 'BDAFX' ";
+						$this->requete_condition[] = "num_nomen = ".$retour[2]." AND BDNT = 'BDAFX' ";
 						break;
 					case  'bdbfx' :
-						$this->Requete->requete_condition[] = "num_nomen = ".$retour[2]." AND BDNT = 'BDBFX' ";
+						$this->requete_condition[] = "num_nomen = ".$retour[2]." AND BDNT = 'BDBFX' ";
 						break;
 					default :
 						$e = 'Erreur dans l\'url de votre requête : </br> Le référentiel " '
 							.$retour[1].' " n\'existe pas.';
 						throw new Exception($e, RestServeur::HTTP_CODE_MAUVAISE_REQUETE);
 						break;
+				}
 			} else {
 				$e = 'Erreur dans l\'url de votre requête : </br> La ressource demandée n\'existe pas.';
 				throw new Exception($e, RestServeur::HTTP_CODE_MAUVAISE_REQUETE);
 				break;
+			}
+	}
 	//+++------------------------------traitement des versions----------------------------------------++
 	public function traiterVersion($valeur) {
 		if (preg_match('/^[0-9]+(?:[._][0-9]+)*$/', $valeur) || $valeur == '*' || $valeur == '+') {
 			$this->version_projet = $valeur;
 		} else {
 			$e = "Erreur : La version est inconnue.";
 			throw new Exception($e, RestServeur::HTTP_CODE_MAUVAISE_REQUETE);
+		}
+	}
-	public function DefinirTables() {
+	public function definirTables() {
 		$table_num_version = $this->recupererVersionDisponible();
 		$prefixe_table = config::get('bdd_table');
 		if ( in_array($this->version_projet,$table_num_version) ) {
 			$this->table_version[] = $prefixe_table.'_v'.$this->version_projet;
 		} elseif ($this->version_projet == '+') {
 					$derniere_version = $table_num_version[count($table_num_version) - 1];
 					$this->table_version[] = $prefixe_table.'_v'.str_replace('.', '_', $derniere_version);
 		} elseif ($this->version_projet == '*') {
 			foreach ($table_num_version as $num_version) {
 				$this->table_version[] = $prefixe_table.'_v'.str_replace('.', '_', $num_version);
+			}
 		} else {
 			$e = "Erreur : La version est inconnue.";
 			throw new Exception($e, RestServeur::HTTP_CODE_MAUVAISE_REQUETE);
+		}
+	}
 //+--------------------------formatages de resultats  -------------------------------------------+
 	public function retournerResultatFormate($resultat) {
 		$resultat_json = $resultat[0];
 		if ($this->retour_format == 'max'){
 			if (!isset($this->parametres['categorie']) ) {
-				$resultat_json = $this->formaterResultatsTousChamps($resultat_json);
+				$this->formaterResultatsTousChamps($resultat_json);
 			} elseif ($this->parametres['categorie'] == 'ecologie') {
-				$resultat_json = $this->formaterResultatsChampsEcologie($resultat_json);
+				 $this->formaterResultatsChampsEcologie($resultat_json);
 			} elseif ($this->parametres['categorie'] == 'description') {
-				$resultat_json = $this->formaterResultatsChampsDescription($resultat_json);
+				 $this->formaterResultatsChampsDescription($resultat_json);
+			}
+		}
-		return $resultat_json;
+		return $this->resultat_json;
+	}
 	public function formaterResultatsTousChamps($resultat) {
-		$resultat_json = $resultat;
+		$this->resultat_json = $resultat;
-		if ($resultat_json['type_bio'] != ""){
-			$tab_ontologie = $this->recupererOntologiePrTypeBio($resultat_json['type_bio']);
-			unset($resultat_json['type_bio']);
+		$this->traiterTypeBio();
-			$resultat_json= array_merge($resultat_json,$tab_ontologie);
-		}
-		$this->champs_ontologiques = $this->recupererTableauConfig('champs_ontologiques');
-		$Graphique_presence =  false;
+		$graphique_presence = $this->traiterOntologieEcologie() ;
-		foreach ($this->champs_ontologiques as $cle => $valeur){
-			if ($resultat_json[$cle] != ""){
-				$Graphique_presence =  true;
-				$tab_ontologie = $this->recupererOntologies($resultat_json[$cle], $cle);
-				unset($resultat_json[$cle]);
-				$resultat_json = array_merge($resultat_json,$tab_ontologie);
-			}
-		}
-		if ($Graphique_presence) {
+		if ($graphique_presence) {
-			$resultat_json['graphique_climat']['libelle'] = 'climat';
-			$resultat_json['graphique_climat']['href'] = $this->ajouterHref('graphiques/climat', strtolower($resultat_json['BDNT']).'.nn:'.$resultat_json['num_nomen']);
-			$resultat_json['graphique_sol']['libelle'] = 'sol';
+			$graphique = $this->ajouterLiensGraphique();
-			$resultat_json['graphique_sol']['href'] = $this->ajouterHref('graphiques/sol', strtolower($resultat_json['BDNT']).'.nn:'.$resultat_json['num_nomen']);
-		}
+					}
-		return $resultat_json ;
+	}
 	public function formaterResultatsChampsEcologie($resultat) {
-		$resultat_json = $resultat;
+		$this->resultat_json = $resultat;
+		$graphique_presence = $this->traiterOntologieEcologie() ;
+		if ($graphique_presence) {
+			$graphique = $this->ajouterLiensGraphique();
+		}
+	}
+	public function formaterResultatsChampsDescription($resultat) {
+	$this->resultat_json = $resultat;
+	$this->traiterTypeBio();
+	}
+	public function traiterOntologieEcologie() {
+		$donnees_presence =  false;
 		$this->champs_ontologiques = $this->recupererTableauConfig('champs_ontologiques');
-		$Graphique_presence =  false;
 		foreach ($this->champs_ontologiques as $cle => $valeur){
-			if ($resultat_json[$cle] != ""){
+			if ($this->resultat_json[$cle] != ""){
-				$Graphique_presence =  true;
+				$donnees_presence =  true;
-				$tab_ontologie = $this->recupererOntologies($resultat_json[$cle], $cle);
+				$this->recupererOntologies($this->resultat_json[$cle], $cle);
-				unset($resultat_json[$cle]);
+				unset($this->resultat_json[$cle]);
-				$resultat_json = array_merge($resultat_json,$tab_ontologie);
+			}
+		}
-	if ($Graphique_presence) {
+		return $donnees_presence;
+	}
+	public function traiterTypeBio() {
-			$resultat_json['graphique_climat']['libelle'] = 'climat';
+		if ($this->resultat_json['type_bio'] != ""){
-			$resultat_json['graphique_climat']['href'] = $this->ajouterHref('graphiques/climat', strtolower($resultat_json['BDNT']).'.nn:'.$resultat_json['num_nomen']);
+			$tab_ontologie = $this->recupererOntologiePrTypeBio($this->resultat_json['type_bio']);
-			$resultat_json['graphique_sol']['libelle'] = 'sol';
+			unset($this->resultat_json['type_bio']);
-			$resultat_json['graphique_sol']['href'] = $this->ajouterHref('graphiques/sol', strtolower($resultat_json['BDNT']).'.nn:'.$resultat_json['num_nomen']);
+			$this->resultat_json= array_merge($this->resultat_json,$tab_ontologie);
+		}
-		return $resultat_json ;
+	}
-	public function formaterResultatsChampsDescription($resultat) {
+	public function ajouterLiensGraphique() {
-		$resultat_json = $resultat;
+		$this->resultat_json['graphique_climat']['libelle'] = 'climat';
-		if ($resultat_json['type_bio'] != ""){
+		$this->resultat_json['graphique_climat']['href'] =
-			$tab_ontologie = $this->recupererOntologiePrTypeBio($resultat_json['type_bio']);
+			$this->ajouterHref('graphiques/climat', strtolower($this->resultat_json['BDNT']).'.nn:'.$this->resultat_json['num_nomen']);
-			unset($resultat_json['type_bio']);
+		$this->resultat_json['graphique_sol']['libelle'] = 'sol';
-			$resultat_json = array_merge($resultat_json,$tab_ontologie);
-		}
+		$this->resultat_json['graphique_sol']['href'] =
-		return $resultat_json ;
+			$this->ajouterHref('graphiques/sol', strtolower($this->resultat_json['BDNT']).'.nn:'.$this->resultat_json['num_nomen']);
+	}
 //+--------------------------traitement ontologies -------------------------------------------+
 	public function recupererOntologies($valeur, $champs){
 		$url = Config::get('url_service_base').Config::get('nom_projet').
 			'/ontologies/'.$this->champs_ontologiques[$champs].':'.urlencode(urlencode($valeur));
 		$val = $this->consulterHref($url);
-		$resultat_json[$champs.'.libelle'] = $val->nom;
+		$this->resultat_json[$champs.'.libelle'] = $val->nom;
-		$resultat_json[$champs.'.code'] = $valeur;
+		$this->resultat_json[$champs.'.code'] = $valeur;
-		$resultat_json[$champs.'.href'] = $url;
+		$this->resultat_json[$champs.'.href'] = $url;
-		return $resultat_json;
+	}
+	//+-------------ontologie pour le champs type biologique (lire le .txt)---+
 	public function recupererOntologiePrTypeBio($type_a_traiter){
 		$resultat_typeBio = "";
 		if ($type_a_traiter != "") {
-			$resultat_typeBio['type_bio.code'] = $type_a_traiter;
 			$types_prim_sec = $this->separerTypesPrimairesSecondaires($type_a_traiter);
+			$types_sstypes = $this->classerPrimSecEnTypesSsTypes($types_prim_sec);
+			$resultat_typeBio = $this->formaterJsonTypeBio($types_sstypes, $type_a_traiter );
+		}
+		return $resultat_typeBio;
+	}
+	public function classerPrimSecEnTypesSsTypes($types_prim_sec) {
+		$types_sstypes = '';
-			foreach ($types_prim_sec as $cle => $tb) {
+		foreach ($types_prim_sec as $cle => $tb) {
-				$types_sstypes[$cle]= $this->separerTypes_SousTypes($tb, $cle);
+			$types_sstypes[$cle]= $this->separerTypes_SousTypes($tb, $cle);
-			}
+		}
-			switch (count($types_sstypes)) {
+		switch (count($types_sstypes)) {
-				case 1 :
+			case 1 :
-					$types_sstypes = $types_sstypes['principal'];
+				$types_sstypes = $types_sstypes['principal'];
-					break;
+				break;
-				case 2 :
+			case 2 :
-					$types_sstypes = array_merge($types_sstypes['principal'],$types_sstypes['secondaire']);
+				$types_sstypes = array_merge($types_sstypes['principal'],$types_sstypes['secondaire']);
-					break;
+				break;
-				case 3 :
+		}
-					$types_sstypes = array_merge($types_sstypes['principal'],
-												$types_sstypes['secondaire'],
-												$types_sstypes['special']);
+		return $types_sstypes;
-					break;
-			}
+	}
+	public function formaterJsonTypeBio( $types_sstypes, $type_a_traiter) {
+		$resultat_typeBio['type_bio.code'] = $type_a_traiter;
-			foreach ($types_sstypes as $cle => $tb) {
+		foreach ($types_sstypes as $cle => $tb) {
+			if (($cle == 'type.principal') || ($cle == 'type.secondaire')) {
+				$i = 0;
-				if (($cle == 'type.principal') || ($cle == 'type.secondaire')) {
+				foreach ($tb as $types) {
 					$url = Config::get('url_service_base').Config::get('nom_projet').
-					'/ontologies/TB:'.urlencode(urlencode($tb));
+						'/ontologies/TB:'.urlencode(urlencode($types));
 					$val = $this->consulterHref($url);
 					$libelle[$cle]= $val->nom;
 					$detail[$cle]['libelle'] = $val->nom;
 					$detail[$cle]['code'] = $val->code;
 					$detail[$cle]['href'] = $url;
+				}
+			}
-				if ($cle == 'sous_type.principal' || $cle == 'sous_type.secondaire' || $cle == 'sous_type.special') {
+			if ($cle == 'sous_type.principal' || $cle == 'sous_type.secondaire' ) {
-					$i = 0;
+				$i = 0;
-					foreach ($tb as $sstypes) {
+				foreach ($tb as $sstypes) {
-						$url = Config::get('url_service_base').Config::get('nom_projet').
+					$url = Config::get('url_service_base').Config::get('nom_projet').
-						'/ontologies/ssTT:'.urlencode(urlencode($sstypes));
+								'/ontologies/ssTT:'.urlencode(urlencode($sstypes));
-						$val = $this->consulterHref($url);
+					$val = $this->consulterHref($url);
-						$libelle[$cle]=$val->nom;
+					$libelle[$cle]=$val->nom;
-						$detail[$cle][$i]['libelle'] = $val->nom;
+					$detail[$cle][$i]['libelle'] = $val->nom;
-						$detail[$cle][$i]['code'] = $val->code;
+					$detail[$cle][$i]['code'] = $val->code;
-						$detail[$cle][$i]['href'] = $url;
+					$detail[$cle][$i]['href'] = $url;
-						$i++;
+					$i++;
-					}
+				}
+			}
-			$resultat_typeBio['type_bio.libelle']= $this->formaterTypeBioPrLibelle($libelle);
-			$resultat_typeBio['type_bio.detail'] = $detail;
+		}
+		$resultat_typeBio['type_bio.libelle']= $this->formaterTypeBioPrLibelle($libelle);
+		$resultat_typeBio['type_bio.detail'] = $detail;
 		return $resultat_typeBio;
+	}
 	public function formaterTypeBioPrLibelle($info) {
 		$libelle = $info['type.principal']." ";
 		$libelle .= isset($info['sous_type.principal']) ? " (".$info['sous_type.principal'].") " : "";
 		$libelle .= isset($info['type.secondaire']) ? ", ".$info['type.secondaire']." " : "";
 		$libelle .= isset($info['sous_type.secondaire']) ? "(".$info['sous_type.secondaire'].") " : "";
-		$libelle .= isset($info['sous_type.special']) ? "(".$info['sous_type.special'].") " : "";
 		return $libelle;
+	}
 	//séparation des principaux et des secondaires
 	public function separerTypesPrimairesSecondaires($type) {
-		$types = array();
-		//séparation des principaux et des secondaires
+		$types = array();
-		if (preg_match("/(.+)\((.+)\)\-{0,1}(.+){0,1}/", $type,$retour) == 1) {
+		if (preg_match("/(.+)\((.+)\)\-{0,1}(.+){0,1}/", $type,$retour)) {
-			$types['principal'] = $retour[1];
+			$types['principal'] = isset($retour[3]) ? $retour[1].'-'. $retour[3] : $retour[1] ;
-			$types['secondaire'] = $retour[2];
-			if (isset($retour[3])){$types['special'] = $retour[3];}
+			$types['secondaire'] = $retour[2];
 		} else {
 			$types['principal'] = $type;
+		}
 		return $types;
+	}
 	public function separerTypes_SousTypes($type_a_traiter, $typePrimOuSec) {
 		$types = array();
+		if (preg_match("/^([a-zA-Zé]+)\-(.+)$|^([a-zA-Zé,]+[^\-])$/", $type_a_traiter, $retour)) {
-		if (preg_match("/^([a-zA-Zé]+)\-(.+)$|^([a-zA-Zé]+[^\-])$/", $type_a_traiter, $retour) == 1) {
+			//type
-    		//recupère le type unique
+			$type = array();
-			$type = (isset($retour[3]) && ($typePrimOuSec != 'special') ) ? $retour[3] : $retour[1] ;
+			$type[0] = (isset($retour[3])) ? $retour[3] : $retour[1] ;
-			$types['type.'.$typePrimOuSec]= $type;
+			if (preg_match("/,/", $type[0])) {
+				$type = preg_split("/,/", $type[0]);
-    		//recupère le ou les sous-types
+			}
-    		if (isset($retour[3]) && $typePrimOuSec == 'special') {
+			for ($i = 0 ; $i < count($type); $i++) {
+				$types['type.'.$typePrimOuSec][$i] = $type[$i];
+			}
-    			$ss_types[0] = (isset($retour[3]) && ($typePrimOuSec == 'special') ) ? $retour[3] : "" ;
+			//sous types
-    		} elseif (isset($retour[2]) && $retour[2] != '') {
+			$ss_types = array();
-    			$ss_types[0]= (isset($retour[2]) && ($retour[2] != "") ) ? $retour[2] : "" ;
-    		}
+			if (isset($retour[2]) && $retour[2] != '') {
-     		if (isset($ss_types[0])) {
+ 				$ss_types[0] =  $retour[2] ;
-    			if (preg_match("/\-/", $ss_types[0]) == 1) {
+ 				if (preg_match("/\-/", $ss_types[0])) {
-    				$ss_types = preg_split("/\-/", $ss_types[0]);
+ 					$ss_types = preg_split("/\-/", $ss_types[0]);
+ 				}
 				for ($i = 0 ; $i < count($ss_types); $i++) {
-    				$types['sous_type.'.$typePrimOuSec][$i] = $ss_types[$i];
+					$types['sous_type.'.$typePrimOuSec][$i] = $ss_types[$i];
-        		}
+				}
+			}
+    	}
+ 		return $types;
+ 	}
+	//+--------------------------FONCTIONS D'ASSEMBLAGE DE LA REQUETE-------------------------------------------+
+	public function assemblerLaRequete() {
+		$requete = 	' SELECT '.$this->champs_recherches.' FROM '.$this->table.' '
+		.$this->retournerRequeteCondition();
+		return $requete;
+	}
+	public  function retournerRequeteCondition() {
+		$condition = '';
+		if (empty($this->requete_condition) == false) {
+			$condition = ' WHERE '.implode(' AND ', $this->requete_condition);
+		}
- 		return $types;
+		return $condition;
+	}
+}
 ?>

Subversion Repositories eFlore/Projets.eflore-projets

(root)/trunk/services/modules/0.1/baseflor/InformationsBaseflor.php – Rev 525 → 548