Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 1758 → Rev 1759

/trunk/jrest/lib/FormateurGroupeColonne.php
8,7 → 8,7
* @license http://www.cecill.info/licences/Licence_CeCILL_V2-fr.txt Licence CECILL
* @license GPL v3 <http://www.gnu.org/licenses/gpl.txt>
*/
define('SEPARATEUR_IMAGES', ",");
define('SEPARATEUR_IMAGES', " / ");
 
Class FormateurGroupeColonne {
 
427,10 → 427,29
return $date_formatee;
}
 
static function getImages_preload($cel, $obsids) {
if(!$obsids) return;
$rec = $cel->requeter(
sprintf("SELECT o.id_observation, GROUP_CONCAT(nom_original ORDER BY nom_original ASC SEPARATOR '%s') AS i " .
"FROM cel_images i LEFT JOIN cel_obs_images oi ON (i.id_image = oi.id_image) LEFT JOIN cel_obs o ON (oi.id_observation = o.id_observation) " .
"WHERE o.ce_utilisateur = %d AND o.id_observation IN (%s) " .
"GROUP BY id_observation",
SEPARATEUR_IMAGES,
$cel->id_utilisateur,
implode(',', $obsids)));
foreach($rec as $v) {
self::$cache['getImages'][$v['id_observation']] = $v['i'];
}
return NULL;
}
 
static function getImages($obs, $id_utilisateur, $cel) {
if(! $id_utilisateur) return NULL;
if(isset(self::$cache['getImages'][$obs['id_observation']]))
return self::$cache['getImages'][$obs['id_observation']];
 
$rec = $cel->requeter(
sprintf("SELECT GROUP_CONCAT(nom_original SEPARATOR '%s') AS i FROM cel_images i"
sprintf("SELECT GROUP_CONCAT(nom_original ORDER BY nom_original ASC SEPARATOR '%s') AS i FROM cel_images i"
." LEFT JOIN cel_obs_images oi ON (i.id_image = oi.id_image)"
." LEFT JOIN cel_obs o ON (oi.id_observation = o.id_observation)"
." WHERE o.ce_utilisateur = %d AND o.id_observation = %d LIMIT 1",