WebSVN – eFlore/Applications.moissonnage – Path Comparison – /

Ignore whitespace Rev 26 → Rev 25

 /trunk/services/configurations/config_floradata.ini
 ,11 → 5,14
 ; Nom de la base utilisée.
 bdd_nom = "tb_cel"
-bdd_eflore = "tb_eflore"
 ; URL de base des services de ce projet
 url_service="{ref:url_base}service:moissonnage:0.1/floradata"
+; +------------------------------------------------------------------------------------------------------+
+; Config spécifique au projet
+; Noms des services disponibles pour ce projet
+servicesDispo = "stations,observations"
 [meta-donnees]
 dureecache = 3600

 /trunk/services/configurations/config_sophy.ini
 ,6 → 9,10
 ; URL de base des services de ce projet
 url_service="{ref:url_base}service:moissonnage:0.1/sophy"
+; +------------------------------------------------------------------------------------------------------+
+; Config spécifique au projet
+; Noms des services disponibles pour ce projet
+servicesDispo = "stations,observations"
 [meta-donnees]
 dureecache = 3600

 /trunk/services/configurations/config.defaut.ini
 ,23 → 66,8
 ; URL de base des services
 url_service_base='{ref:url_base}service:moissonnage:0.1/'
 ; +------------------------------------------------------------------------------------------------------+
-; Infos sur les controles a effectuer sur les cartes et les donnees a afficher
-carte.limite_ouest = -180
-carte.limite_est = 180
-carte.limite_sud = -85.051129
-carte.limite_nord = 85.051129
-carte.zoom_minimal = 3
-carte.zoom_maximal = 18
-zoom_maximal_maillage = 13
-seuil_maillage = 500
-; +------------------------------------------------------------------------------------------------------+
 ; Autres informations
-sources_dispo = "floradata,sophy"
-source_defaut = "floradata"
-services_dispo = "stations,observations"
-referentiels_dispo = "bdtfx_v1_01,bdtxa_v1_00"
+sourcesDispo = "cel,sophy"
+referentielsDispo = "bdtfx_v1_01,bdtxa_v1_00"

/trunk/services/bibliotheque/Maillage.php
File deleted
\ No newline at end of file

/trunk/services/bibliotheque/VerificateurParametres.php
File deleted
\ No newline at end of file

/trunk/services/bibliotheque/FormateurJson.php
File deleted
\ No newline at end of file

/trunk/services/bibliotheque/Maille.php
File deleted
\ No newline at end of file

/trunk/services/bibliotheque/Referentiel.php
File deleted
\ No newline at end of file

 /trunk/services/bibliotheque/CacheMoissonnage.php
 ,20 → 4,18
         private $service;
         private $config;
         private $dureecache = 0;
+        private $projetNom;
         private $serviceNom;
         private $cache;
         private $cacheActif;
-        public function __construct($service, $serviceNom, $cacheActif) {
+        public function __construct($service, $projetNom, $serviceNom, $cacheActif) {
                 $this->cacheActif = $cacheActif;
                 $this->service = $service;
                 $this->chargerDureeCache();
+                $this->projetNom = $projetNom;
                 $this->serviceNom = $serviceNom;
-                $this->cache = new CacheSimple(array(
-                        "mise_en_cache"   => true,
-                        "stockage_chemin" => Config::get("chemincache"),
-                        "duree_de_vie"    => $this->dureecache
-                ));
+                $this->cache = new CacheSimple(array("mise_en_cache" => true, "stockage_chemin" => Config::get("chemincache"), "duree_de_vie" => $this->dureecache));
         }
         public function chargerDureeCache() {
 ,7 → 59,7
                         }
                 }
-                $chaineMD5 = $this->serviceNom.'/'.md5($chaineRessources.$chaineParametres);
+                $chaineMD5 = $this->projetNom.'/'.$this->serviceNom.'/'.md5($chaineRessources.$chaineParametres);
                 return $chaineMD5;
         }
 }