| 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']; |