Subversion Repositories eFlore/Projets.eflore-projets

Compare Revisions

Ignore whitespace Rev 1285 → Rev 1286

/trunk/services/modules/0.1/cel/Images.php
231,11 → 231,11
$numNom = $this->Bdd->proteger($this->ref_tax_demande[$refTax][0]);
 
$requete = 'SELECT ci.id_image AS id_image '.
'FROM cel_images AS ci '.
' LEFT JOIN cel_obs AS co '.
'FROM cel_images_export AS ci '.
' LEFT JOIN cel_export AS co '.
'ON (ci.ce_observation = co.id_observation) '.
'WHERE co.transmission = 1 '.
" AND co.nom_ret_nn IN ($numNom)";
'WHERE '.
" co.nom_ret_nn IN ($numNom)";
" AND co.nom_referentiel = ".$this->Bdd->proteger($refTax) . ' -- ' . __FILE__ . ':' . __LINE__;
 
$resultat = $this->Bdd->recupererTous($requete);
254,11 → 254,11
$refTax = $this->parametres['referentiel'];
$numNom = $this->Bdd->proteger($this->ref_tax_demande[$refTax][0]);
$requete = 'SELECT ci.id_image AS id_image '.
'FROM cel_images AS ci'.
' LEFT JOIN cel_obs AS co '.
'FROM cel_images_export AS ci'.
' LEFT JOIN cel_export AS co '.
' ON (ci.ce_observation = co.id_observation) '.
'WHERE co.transmission = 1 '.
" AND co.nom_ret_nn IN ($numNom) ".
'WHERE '.
" co.nom_ret_nn IN ($numNom) ".
' AND ci.date_prise_de_vue != "0000-00-00" '.
' AND co.nom_referentiel LIKE '.$this->Bdd->proteger($refTax.'%').' '.
' ORDER BY ci.date_prise_de_vue ASC '.
283,8 → 283,8
' ci.courriel_utilisateur AS utilisateur_courriel, '.
' nom_sel, nom_sel_nn, '.
' zone_geo, ce_zone_geo, lieudit, station, milieu '.
'FROM cel_images AS ci'.
' LEFT JOIN cel_obs AS co '.
'FROM cel_images_export AS ci'.
' LEFT JOIN cel_export AS co '.
' ON (ci.ce_observation = co.id_observation) '.
'WHERE ci.id_image = '.$this->ressources[0].
' AND co.id_observation IS NOT NULL' . ' -- ' . __FILE__ . ':' . __LINE__;
305,8 → 305,8
' co.nom_sel, co.nom_sel_nn, '.
' ci.id_image AS id_img, co.date_observation AS date '.
(isset($this->parametres['retour.champs']) ? ', '.$this->parametres['retour.champs'] : '').
'FROM cel_images AS ci'.
' LEFT JOIN cel_obs AS co '.
'FROM cel_images_export AS ci'.
' LEFT JOIN cel_export AS co '.
' ON (ci.ce_observation = co.id_observation) '.
$this->formerRequeteConditions($numNomListe).' '.
'GROUP BY id_img '.
/trunk/services/configurations/config_cel.ini
3,7 → 3,7
; Nom du projet
nom_projet = "cel"
; Nom de la base utilisée.
bdd_nom = "tb_cel"
bdd_nom = "tb_new_cel"
; Nom de la table métadonnées utilisée.
bdd_table_meta = "cel_meta"
; URL de base des services de ce projet