Subversion Repositories eFlore/Applications.cel

Rev

Rev 3817 | Rev 3820 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 3817 Rev 3818
Line 52... Line 52...
52
		$criteres['dir'] = isset($_GET['dir']) ? $_GET['dir'] : self::dir_defaut;
52
		$criteres['dir'] = isset($_GET['dir']) ? $_GET['dir'] : self::dir_defaut;
Line 53... Line 53...
53
 
53
 
54
		$chercheur_images = new RechercheImage($this->config);
54
		$chercheur_images = new RechercheImage($this->config);
55
		$total = $chercheur_images->compterImages(null, $criteres);
55
		$total = $chercheur_images->compterImages(null, $criteres);
-
 
56
		$images = $chercheur_images->rechercherImagesJoinObservation(null, $criteres, $this->start, $this->limit);
56
		$images = $chercheur_images->rechercherImagesJoinObservation(null, $criteres, $this->start, $this->limit);
57
        $images = $this->mettreEnForme($images);
57
 
58
		
58
		$resultat = array('total' => $total,'images' => $images);
59
		$resultat = array('total' => $total,'images' => $images);
59
		$images_json = json_encode($resultat);
60
		$images_json = json_encode($resultat);
Line 60... Line 61...
60
		$images_json = str_replace('\u0000','',$images_json);
61
		$images_json = str_replace('\u0000','',$images_json);
61
 
62
 
62
		header("content-type: application/json");
63
		header("content-type: application/json");
63
		print $images_json;
64
		print $images_json;
-
 
65
		exit();
-
 
66
	}
-
 
67
	public function mettreEnForme($images) {
-
 
68
	    $retour = array();
-
 
69
	    foreach ($images as $id => $image) {
-
 
70
	       $retour[$id]["utilisateur"]['id_utilisateur'] = $image['id_utilisateur'];
-
 
71
	       unset($image['id_utilisateur']);
-
 
72
	       $retour[$id]["utilisateur"]['mail_utilisateur'] = $image['mail_utilisateur'];
-
 
73
	       unset($image['mail_utilisateur']);
-
 
74
	       $retour[$id]["utilisateur"]['nom_utilisateur'] = $image['nom_utilisateur'];
-
 
75
	       unset($image['nom_utilisateur']);
-
 
76
	       
-
 
77
	       $retour[$id]['id_photo'] = $image['id_photo'];
-
 
78
	       unset($image['id_photo']);
-
 
79
	       $retour[$id]['guid'] = $image['guid'];
-
 
80
	       unset($image['guid']);
-
 
81
	       $retour[$id]['nom_original'] = $image['nom_original'];
-
 
82
	       unset($image['nom_original']);
-
 
83
	       $retour[$id]['date_photo'] = $image['date_photo'];
-
 
84
	       unset($image['date_photo']);
-
 
85
	       $retour[$id]['licence'] = $image['licence'];
-
 
86
	       unset($image['licence']);
-
 
87
	       $retour[$id]['attribution'] = $image['attribution'];
-
 
88
	       unset($image['attribution']);
-
 
89
	       $retour[$id]['url_photo'] = $image['url_photo'];
-
 
90
	       unset($image['url_photo']);
-
 
91
	       $retour[$id]['tags_photo'] = $image['tags_photo'];
-
 
92
	       unset($image['tags_photo']);
-
 
93
	       
-
 
94
	       $retour[$id]['obs'] = $image;
-
 
95
	    }
64
		exit();
96
	    return $retour;
65
	}
97
	}