Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 3672 → Rev 3673

/branches/v3.00-serfouette/jrest/services/CelSyndicationImage.php
454,7 → 454,7
' JOIN cel_export_total AS b '.
' ON (c.ce_observation = b.id_observation) '.
'WHERE '.
(($this->etreFluxAdmin()) ? '' : ' AND b.transmission = 1 ').
(($this->etreFluxAdmin()) ? '' : ' b.transmission = 1 ').
' AND ';
 
if ($this->estUneRechercheGenerale()) {
462,6 → 462,9
$requete .= "donnees_standard = 1 AND ".$this->creerSousRequeteRechercheGenerale($chaine_requete);
} else {
$criteres = $this->traiterCriteresMultiples($_GET) ;
if (!isset($_GET["standard"])) {
$requete .= "donnees_standard = 1 AND ";
}
if (!empty($criteres)) {
$requete .= $this->creerSousRequeteRechercheParCriteres($criteres);
}