Subversion Repositories Sites.obs-saisons.fr

Compare Revisions

Ignore whitespace Rev 263 → Rev 262

/trunk/applications/jrest/services/OdsExport.php
42,9 → 42,7
' LEFT JOIN ods_individus '.
' ON oi_id_individu = oo_ce_individu'.
' LEFT JOIN ods_stations '.
' ON oi_ce_station = os_id_station '.
' LEFT JOIN ods_communes '.
'ON os_ce_commune = oc_code_insee ';
' ON oi_ce_station = os_id_station ';
$requete_selection_observations .= $this->construireConditionRequete();
$requete_selection_observations .= ' ORDER BY oo_date DESC';
54,15 → 52,6
return $res_selection_observations;
}
private function creerFiltreIdZoneGeo($valeurMasque) {
$masque = '';
$dept = $valeurMasque;
$dept = sprintf('%02s', $dept);
$dept = sprintf("%-'_5s", $dept);
$masque = " oc_code_insee LIKE ".$this->proteger($dept);
return $masque;
}
public function construireConditionRequete() {
$condition = ' WHERE oo_date != "0000-00-00" AND DAY(oo_date) != "00" AND ';
105,10 → 94,8
$condition .= 'oo_ce_participant = '.$this->proteger($valeur);
break;
case 'dept' :
$condition .= $this->creerFiltreIdZoneGeo($valeur);
default:
break;
default:
}
$condition .= ' AND ';