Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 1331 → Rev 1332

/trunk/jrest/lib/RechercheObservation.php
65,7 → 65,7
$resultats_observations = array();
$resultats_observations = $this->requeter($requete_selection_observations);
 
return $resultats_observations;
}
104,6 → 104,12
}
$mots_cles_chaine = rtrim($mots_cles_chaine,';');
$observation['mots_cles'] = $mots_cles_chaine;
foreach($observation as $champ => $valeur) {
if($valeur == 'NULL') {
$observation[$champ] = "";
}
}
}
return $tableau_observations;
150,27 → 156,47
break;
case 'annee':
$sous_requete .= "year(date_observation) = ".$this->proteger($valeur) ;
if($valeur == "NULL") {
$sous_requete .= "date_observation IS NULL OR year(date_observation) = 0000" ;
} else {
$sous_requete .= "year(date_observation) = ".$this->proteger($valeur) ;
}
$sous_requete .= ' AND ' ;
break;
case 'mois':
$sous_requete .= "month(date_observation) = ".$this->proteger($valeur) ;
if($valeur == "NULL") {
$sous_requete .= "date_observation IS NULL OR month(date_observation) = 00" ;
} else {
$sous_requete .= "month(date_observation) = ".$this->proteger($valeur) ;
}
$sous_requete .= ' AND ' ;
break;
case 'jour':
$sous_requete .= "day(date_observation) = ".$this->proteger($valeur) ;
if($valeur == "NULL") {
$sous_requete .= "date_observation IS NULL OR day(date_observation) = 00" ;
} else {
$sous_requete .= "day(date_observation) = ".$this->proteger($valeur) ;
}
$sous_requete .= ' AND ' ;
break;
case 'departement':
$sous_requete .= "ce_zone_geo LIKE ".$this->proteger('INSEE-C:'.$valeur.'___');
if($valeur == "NULL") {
$sous_requete .= "(ce_zone_geo IS NULL OR ce_zone_geo = '')";
} else {
$sous_requete .= "ce_zone_geo LIKE ".$this->proteger('INSEE-C:'.$valeur.'___');
}
$sous_requete .= ' AND ' ;
break;
case 'commune':
$sous_requete .= "zone_geo = ".$this->proteger($valeur);
if($valeur == "NULL") {
$sous_requete .= "(zone_geo IS NULL OR zone_geo = '')";
} else {
$sous_requete .= "zone_geo = ".$this->proteger($valeur);
}
$sous_requete .= ' AND ' ;
break;
189,6 → 215,10
{
$sous_requete .= $nom." = ".$this->proteger($valeur) ;
$sous_requete .= ' AND ' ;
}
if(trim($nom) == "NULL") {
$sous_requete .= "(".$nom." IS NULL OR ".$nom." = '')" ;
$sous_requete .= ' AND ' ;
}
break;
}