/trunk/widget/modules/observation/Observation.php |
---|
128,17 → 128,11 |
private function traiterParametres() { |
$parametres_flux = '?'; |
$criteres = array( |
'utilisateur' => 'auteur', |
'commune' => 'commune', |
'departement' => 'departement', |
'taxon' => 'taxon', |
'commentaire' => 'commentaire', |
'date' => 'date', |
'tag' => 'projet'); |
$criteres = array('utilisateur', 'commune', 'dept', 'taxon', 'commentaire', 'date', 'projet'); |
foreach($this->parametres as $nom_critere => $valeur_critere) { |
if (isset($criteres[$nom_critere])) { |
$parametres_flux .= $criteres[$nom_critere].'='.$valeur_critere.'&'; |
if (in_array($nom_critere, $criteres)) { |
$valeur_critere = str_replace(' ', '%20', $valeur_critere); |
$parametres_flux .= $nom_critere.'='.$valeur_critere.'&'; |
} |
} |
/trunk/widget/modules/photo/Photo.php |
---|
139,17 → 139,11 |
private function traiterParametres() { |
$parametres_flux = '?'; |
$criteres = array( |
'utilisateur' => 'auteur', |
'commune' => 'commune', |
'departement' => 'departement', |
'taxon' => 'taxon', |
'commentaire' => 'commentaire', |
'date' => 'date', |
'tag' => 'mots-cles'); |
$criteres = array('utilisateur', 'commune', 'dept', 'taxon', 'commentaire', 'date', 'tag'); |
foreach($this->parametres as $nom_critere => $valeur_critere) { |
if (isset($criteres[$nom_critere])) { |
$parametres_flux .= $criteres[$nom_critere].'='.$valeur_critere.'&'; |
if (in_array($nom_critere, $criteres)) { |
$valeur_critere = str_replace(' ', '%20', $valeur_critere); |
$parametres_flux .= $nom_critere.'='.$valeur_critere.'&'; |
} |
} |
/trunk/jrest/services/CelSyndicationObservation.php |
---|
30,9 → 30,9 |
private $squelette_dossier = null; |
private $flux = array(); |
private $criteres = array( |
'auteur' => 'identifiant', |
'utilisateur' => 'identifiant', |
'commune' => 'location', |
'departement' => 'id_location', |
'dept' => 'id_location', |
'taxon' => 'nom_ret', |
'commentaire' => 'commentaire', |
'date' => 'date_observation', |
351,7 → 351,7 |
private function creerSousRequeteMotsCles($mot_cle) { |
$requete = 'mots_cles like "inexistant" OR'; |
if (preg_match('/.*,.*/', $mot_cle)) { |
if (preg_match('/.*OU.*/', $mot_cle)) { |
$requete = $this->creerSousRequeteMotsClesOu($mot_cle); |
} else if (preg_match('/.*ET.*/', $mot_cle)) { |
$requete = $this->creerSousRequeteMotsClesEt($mot_cle); |
375,10 → 375,10 |
private function creerSousRequeteMotsClesOu($mot_cle) { |
$requete = 'mots_cles like "inexistant" OR'; |
$tab_mots_cles = explode(',', $mot_cle); |
$tab_mots_cles = explode('OU', $mot_cle); |
$where = ''; |
foreach ($tab_mots_cles as $mot) { |
$where .= 'cmc_id_mot_cle_general = '.$this->bdd->quote($this->encoderMotCle($mot)).' OR '; |
$where .= 'cmc_id_mot_cle_general = '.$this->bdd->quote($this->encoderMotCle(trim($mot))).' OR '; |
} |
$where = rtrim($where,' OR '); |
406,7 → 406,7 |
foreach ($tab_mots_cles as $mot) { |
$champs .= "$i.cmc_id_mot_cle_utilisateur as $i , "; |
$table .= "cel_mots_cles_obs $i , "; |
$where .= "$i.cmc_id_mot_cle_general = ".$this->bdd->quote($this->encoderMotCle($mot)).' AND '; |
$where .= "$i.cmc_id_mot_cle_general = ".$this->bdd->quote($this->encoderMotCle(trim($mot))).' AND '; |
if ($i !== "a") { |
$where .= " $i.cmc_id_proprietaire = ".$j.".cmc_id_proprietaire AND "; |
$j++; |
487,6 → 487,7 |
private function construireDonneesCommunesAuFlux($observations) { |
$donnees = $this->getFlux($this->service); |
$donnees['guid'] = $this->getUrlServiceBase(); |
$donnees['titre'] = 'Flux des observations du CEL'; |
$donnees['lien_service'] = $this->creerUrlService(); |
$donnees['lien_cel'] = $this->config['settings']['baseURLAbsolu']; |
$donnees['editeur'] = $this->config['settings']['editeur']; |
/trunk/jrest/services/CelSyndicationImage.php |
---|
23,13 → 23,13 |
private $format_image = 'XL'; |
private $criteres = array( |
'auteur' => 'c.ci_ce_utilisateur', |
'utilisateur' => 'c.ci_ce_utilisateur', |
'commune' => 'b.location', |
'departement' => 'b.id_location', |
'dept' => 'b.id_location', |
'taxon' => 'b.nom_ret', |
'commentaire' => 'c.ci_meta_comment', |
'date' => 'c.ci_meta_date', |
'mots-cles' => 'mots-cles'); |
'tag' => 'mots-cles'); |
/** |
* Méthode appelée avec une requête de type GET. |
416,7 → 416,7 |
if ($elements != false && count($elements) > 0) { |
$contenu = $this->executerService($elements); |
} else { |
$this->messages[] = "Aucune image disponible."; |
$this->messages[] = "Aucune image disponible.".$requete; |
} |
return $contenu; |
457,7 → 457,7 |
private function creerSousRequeteMotsCles($mot_cle) { |
$requete = ' ( '; |
if (preg_match('/.*,.*/', $mot_cle)) { |
if (preg_match('/.*OU.*/', $mot_cle)) { |
$requete = $this->creerSousRequeteMotsClesOu($mot_cle); |
} else if (preg_match('/.*ET.*/', $mot_cle)) { |
$requete = $this->creerSousRequeteMotsClesEt($mot_cle); |
480,10 → 480,10 |
private function creerSousRequeteMotsClesOu($mot_cle) { |
$requete = ' ( '; |
$tab_mots_cles = explode(',', $mot_cle); |
$tab_mots_cles = explode('OU', $mot_cle); |
$where = ''; |
foreach ($tab_mots_cles as $mot) { |
$where .= 'cmc_id_mot_cle_general = '.$this->bdd->quote($this->encoderMotCle($mot)).' OR '; |
$where .= 'cmc_id_mot_cle_general = '.$this->bdd->quote($this->encoderMotCle(trim($mot))).' OR '; |
} |
$where = rtrim($where,' OR '); |
510,7 → 510,7 |
foreach ($tab_mots_cles as $mot) { |
$champs .= "$i.cmc_id_mot_cle_utilisateur as $i , "; |
$table .= "cel_mots_cles_images $i , "; |
$where .= "$i.cmc_id_mot_cle_general = ".$this->bdd->quote($this->encoderMotCle($mot)).' AND '; |
$where .= "$i.cmc_id_mot_cle_general = ".$this->bdd->quote($this->encoderMotCle(trim($mot))).' AND '; |
if ($i !== "a") { |
$where .= " $i.cmc_id_proprietaire = ".$j.".cmc_id_proprietaire AND "; |
$j++; |
520,11 → 520,11 |
$where = rtrim($where,' AND '); $champs = rtrim($champs,' , '); $table = rtrim($table,' , '); |
// Construction de la requête |
$prerequete = "SELECT $champs FROM $table WHERE $where "; |
$prerequete = "SELECT $champs FROM $table WHERE $where "; |
$elements = $this->executerRequete($prerequete);//print_r($elements); |
if ($elements != false && count($elements) > 0) { |
foreach ($elements as $occurence) { |
$requete = ' ('; |
$requete .= ' ('; |
for ($j = 'a'; $j < $i; $j++) { |
$requete .= 'ci_meta_mots_cles like "%'.$occurence[$j].'%" AND '; |
} |