Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 1390 → Rev 1391

/trunk/jrest/services/ImageRDF.php
34,14 → 34,12
// Recherche de toutes les observations transmises du taxon pour lesquelles une photo est associee.
$requete_obs_publiques_images_taxon = 'SELECT * FROM cel_obs, cel_obs_images, cel_images '.
' WHERE cel_obs.nom_sel_nn = '.$this->proteger($uid[0]).
' AND cel_obs_images.id_utilisateur = cel_obs.ce_utilisateur '.
' AND cel_obs_images.id_observation = cel_obs.id_observation '.
' AND cel_obs.transmission = 1 '.
' AND cel_images.ce_utilisateur = cel_obs_images.id_utilisateur '.
' AND cel_images.id_image = cel_obs_images.id_image';
 
$resultat_requete_obs_images_taxon = $this->requeter($requete_obs_publiques_images_taxon);
$picture_path = $this->config['cel_db']['url_images'];
$picture_path = $this->config['cel']['url_images'];
// Formatage du xml
$xml = '<?xml version="1.0" encoding="utf-8"?>'."\n";
79,7 → 77,7
$xml .= '[image_ordre:'.$picture['ordre'].']';
$xml .= '[observation_identifiant:'.$picture['id_observation'].']';
$xml .= '[observation_ordre:'.$picture['ordre'].']'.'"'."\n";
$xml .= ' dc:creator="'.$picture['ce_utilisateur'].'"'."\n";
$xml .= ' dc:creator="'.$picture['courriel_utilisateur'].'"'."\n";
$xml .= ' dc:publisher="CEL"'."\n";
$xml .= ' dcterms:spatial="'.utf8_decode($picture['zone_geo'])." (".$picture['ce_zone_geo'].")".'"'."\n";
/trunk/jrest/services/Resume.php
45,7 → 45,7
 
foreach ($dernieres_obs as $obs) {
 
$chemin_sur_serveur = $this->config['cel_db']['url_images'];
$chemin_sur_serveur = $this->config['cel']['url_images'];
 
$date = 'Datée du '.$obs['date_modification'].'<br/>' ;
$lieu = 'Lieu : '.trim($obs['zone_geo'],'000null').' ('.$this->convertirCodeZoneGeoVersDepartement(trim($obs['ce_zone_geo']),'000null').') '.trim($obs['station'],'000null').' '.trim($obs['lieudit'],'000null').'<br/>' ;
/trunk/jrest/services/InventoryImageExport.php
36,10 → 36,10
 
$taille_archive_courante = 0;
$index_archive_courante = 0;
$taille_max_archive = $this->config['cel_db']['taille_max_archive'];
$taille_max_archive = $this->config['cel']['taille_max_archive'];
$liens_archives = array();
 
$DB=$this->connectDB($this->config,'cel_db');
$DB=$this->connectDB($this->config,'cel');
 
$query_id_id_img = 'SELECT cmc_id_mot_cle_utilisateur, cmc_id_proprietaire FROM cel_mots_cles_images WHERE cmc_id_mot_cle_general = md5("'.$DB->escapeSimple($tag).'")' ;
 
115,7 → 115,7
$nom_fichier_image = $image['ci_nom_original'].'_'.$id.'.jpg';
}
$chemin_sur_serveur = $this->config['cel_db']['url_images'];
$chemin_sur_serveur = $this->config['cel']['url_images'];
$id = sprintf('%09s', $id) ;
$id = wordwrap($id, 3 , '_', true) ;
270,9 → 270,9
private function renvoyerCheminSurServeur($id,$url = true) {
 
if($url) {
$chemin_sur_serveur = $this->config['cel_db']['url_images'];
$chemin_sur_serveur = $this->config['cel']['url_images'];
} else {
$chemin_sur_serveur = $this->config['cel_db']['chemin_images'];
$chemin_sur_serveur = $this->config['cel']['chemin_images'];
}
 
$id = sprintf('%09s', $id) ;
294,9 → 294,9
 
private function renvoyerCheminExport($url = true) {
if($url) {
return $this->config['cel_db']['url_export'];
return $this->config['cel']['url_export'];
} else {
return $this->config['cel_db']['chemin_export'];
return $this->config['cel']['chemin_export'];
}
}
 
/trunk/jrest/services/ImageContribution.php
48,7 → 48,7
 
foreach ($obs_liees_images as $obs) {
 
$chemin_sur_serveur = $this->config['cel_db']['url_images'];
$chemin_sur_serveur = $this->config['cel']['url_images'];
 
$requete_img_liees = 'SELECT * FROM cel_images WHERE id_image '.
'IN (SELECT id_image FROM cel_obs_images '.