/trunk/jrest/services/InventoryObservationList.php |
---|
61,7 → 61,7 |
$debut = $taille_page*$numero_page ; |
$retour = $chercheur_observations->rechercherObservations($uid[0], $criteres, $debut, $taille_page); |
$retour_formate = $chercheur_observations->formaterPourEnvoiCel(&$retour); |
$retour_formate = $chercheur_observations->formaterPourEnvoiCel($retour); |
$this->envoyerJson($retour_formate); |
return true; |
/trunk/jrest/services/InventoryImageList.php |
---|
50,7 → 50,7 |
$debut = $taille_page*$numero_page ; |
$retour = $chercheur_images->rechercherImagesEtObservationAssociees($uid[0], $criteres, $debut, $taille_page); |
$retour = $chercheur_images->formaterPourEnvoiCel(&$retour); |
$retour = $chercheur_images->formaterPourEnvoiCel($retour); |
$retour_encode = json_encode($retour) ; |
$retour_encode = $this->nettoyerCaracteresNuls($retour_encode); |
/trunk/jrest/services/Inventory.php |
---|
48,7 → 48,7 |
$observation = $retour_recherche[0]; |
} |
$observation = $this->formaterObservationVersTableauSequentiel(&$observation); |
$observation = $this->formaterObservationVersTableauSequentiel($observation); |
$output = json_encode($observation); |
$this->envoyerJson($output); |
55,7 → 55,7 |
return true; |
} |
private function formaterObservationVersTableauSequentiel($observation) { |
private function formaterObservationVersTableauSequentiel(&$observation) { |
if ($observation['date_observation']!="0000-00-00 00:00:00") { |
list($year,$month,$day)= explode('-',$observation['date_observation']); |
/trunk/jrest/services/InventoryExport.php |
---|
79,7 → 79,7 |
$i=1; |
foreach ($observations as &$obs) { |
$obs = $this->denullifierTableauValeurCel(&$obs); |
$obs = $this->denullifierTableauValeurCel($obs); |
$ids_obs[] = $obs['id_observation']; |
$indices_lignes_obs[$obs['id_observation']] = $i; |
/trunk/jrest/lib/GestionObservation.php |
---|
296,7 → 296,7 |
* |
* @return $parametres le tableau modifié selon ce qu'il contenait |
*/ |
private function formaterParametresObservation($parametres) { |
private function formaterParametresObservation(&$parametres) { |
$code_referentiel = 'bdtfx'; |
if(!isset($parametres['nom_referentiel'])) { |
393,7 → 393,7 |
$sous_requete = ''; |
$parametres = $this->formaterParametresObservation(&$parametres); |
$parametres = $this->formaterParametresObservation($parametres); |
$champs = ''; |
$valeurs = ''; |
434,7 → 434,7 |
$sous_requete = ''; |
$parametres = $this->formaterParametresObservation(&$parametres); |
$parametres = $this->formaterParametresObservation($parametres); |
// Nullifiage ... |
// TODO: code dupliqué, en faire une fonction à mettre à la place appropriée |
/trunk/jrest/lib/RechercheObservation.php |
---|
85,7 → 85,7 |
return $nb_obs; |
} |
public function formaterPourEnvoiCel($tableau_observations) { |
public function formaterPourEnvoiCel(&$tableau_observations) { |
$ids = array(); |
foreach ($tableau_observations as &$observation) { |
$observation['ce_zone_geo'] = $this->convertirCodeZoneGeoVersCodeInsee($observation['ce_zone_geo']); |
/trunk/jrest/lib/RechercheImage.php |
---|
310,7 → 310,7 |
return $requete; |
} |
public function formaterPourEnvoiCel($tableau_images) { |
public function formaterPourEnvoiCel(&$tableau_images) { |
foreach($tableau_images as &$image) { |
$ids_mots_cles = $this->getIdsMotsClesImage($image['id_image']); |
$mots_cles_chaine = ''; |
/trunk/jrest/lib/Cel.php |
---|
485,7 → 485,7 |
//+----------------------------------------------------------------------------------------------------------------+ |
// GESTION DE MÉTHODES COMMUNES ENTRE LES SERVICES |
protected function denullifierTableauValeurCel($tableau) { |
protected function denullifierTableauValeurCel(&$tableau) { |
// Denullifiage |
foreach($tableau as $k=>$v) { |