Changeset 695
- Timestamp:
- 01/16/13 19:56:01 (11 years ago)
- Files:
-
- 5 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
ether_megapoli/trunk/persistence/implementation/hibernate.cfg.xml
r673 r695 17 17 <prop key="hibernate.bytecode.use_reflection_optimizer">false</prop> 18 18 <prop key="hibernate.connection.driver_class">org.postgresql.Driver</prop> 19 < prop key="hibernate.connection.url">jdbc:postgresql://darkstar.ipslnet:5432/megapoli_4</prop>20 < !--<prop key="hibernate.connection.url">jdbc:postgresql://darkstar.private.ipsl.fr:5432/MEGAPOLI_TEST4</prop>-->19 <!--<prop key="hibernate.connection.url">jdbc:postgresql://darkstar.ipslnet:5432/megapoli_4</prop>--> 20 <prop key="hibernate.connection.url">jdbc:postgresql://darkstar.private.ipsl.fr:5432/MEGAPOLI_TEST4</prop> 21 21 <prop key="hibernate.connection.username">postgres</prop> 22 22 <prop key="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</prop> -
ether_megapoli/trunk/web/WEB-INF/megapoli.properties
r673 r695 1 1 #les path d'acces aux données 2 data.upload.root=/home /www/httpd_data/megapoli_data/data/upload3 data.access.root=/home /www/httpd_data/megapoli_data/data/download4 data.upload.desc=/home /www/httpd_data/megapoli_data/data/xml/uploadHierarchie.xml5 data.access.desc=/home /www/httpd_data/megapoli_data/data/xml/accessHierarchie.xml6 annuaire=/ usr/local/megapoli/annuaire.xml2 data.upload.root=/home_local/PROJETS/MEGAPOLI/megapoli_data/data/upload 3 data.access.root=/home_local/PROJETS/MEGAPOLI/megapoli_data/data/download 4 data.upload.desc=/home_local/PROJETS/MEGAPOLI/megapoli_data/data/xml/uploadHierarchie.xml 5 data.access.desc=/home_local/PROJETS/MEGAPOLI/megapoli_data/data/xml/accessHierarchie.xml 6 annuaire=/home_local/PROJETS/MEGAPOLI/megapoli_data/data/xml/annuaire.xml 7 7 8 8 #le path d'accÚs aux images 9 data.img=/home /www/httpd_data/megapoli_data/data/images9 data.img=/home_local/PROJETS/MEGAPOLI/megapoli_data/data/images 10 10 11 11 #le serveur mail 12 12 mail.host=mailhost.ipsl.jussieu.fr 13 mail.webmaster= megapoli-admin@ipsl.jussieu.fr14 mail.PI= Matthias.Beekmann@lisa.u-pec.fr15 url.upload=http:// vador.private.ipsl.fr:8080/megapoli/InitLogon.do16 url.extractcgi=http:// vador.private.ipsl.fr/cgi-bin/megapoli/megapoli_extract.cgi13 mail.webmaster=vmipsl@ipsl.jussieu.fr 14 mail.PI=vanessa.maigne@ipsl.jussieu.fr 15 url.upload=http://localhost:8080/megapoli/InitLogon.do 16 url.extractcgi=http://localhost:8080/megapoli_data/cgi-bin/megapoli_extract.cgi 17 17 18 18 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! … … 23 23 data.upload.tree.view=/data/upload/arborescence.jsp 24 24 data.upload.files.view=/data/upload/files.jsp 25 data.access.tree.view=/data/access/arborescence.jsp26 data.access.files.view=/data/access/files.jsp25 #data.access.tree.view=/data/access/arborescence.jsp 26 #data.access.files.view=/data/access/files.jsp 27 27 28 28 #Fichiers de configuration "caches" : places dans le WEB-INF … … 33 33 34 34 # ParamÚtres pour l'insertion des jeux de données 35 #data.output=/home/www/httpd_data/megapoli_data/data/output36 #data.upload=/home/www/httpd_data/megapoli_data/data/upload37 #data.metadata=/home/www/httpd_data/megapoli_data/data/metadata38 #data.model=/home/www/httpd_data/megapoli_data/data/models39 #data.download=/home/www/httpd_data/megapoli_data/data/download35 data.output=/home_local/PROJETS/MEGAPOLI/megapoli_data/data/output 36 data.upload=/home_local/PROJETS/MEGAPOLI/megapoli_data/data/upload 37 data.metadata=/home_local/PROJETS/MEGAPOLI/megapoli_data/data/metadata 38 data.model=/home_local/PROJETS/MEGAPOLI/megapoli_data/data/models 39 data.download=/home_local/PROJETS/MEGAPOLI/megapoli_data/data/download 40 40 41 41 # ParamÚtres pour la simulation 42 directory.simulation=/home /www/httpd_data/megapoli_data/data/simulation/output42 directory.simulation=/home_local/PROJETS/MEGAPOLI/Simulations -
ether_megapoli/trunk/web/data/files.jsp
r338 r695 40 40 </div> 41 41 42 <div style="float:right"> 43 <a onclick='javascript:neededLogin("/ZipGame.do?path=<%=path%>")' title='<bean:message key="data.access.downloading"/>'> 44 <html:img page="/resources/images/utils/text.png" alt="file"/> 45 <bean:message arg0="${nomJeu}" key="data.access.files.dowload.zip"/> 46 </a> 47 </div> 48 49 <BR/> 50 51 <%-- ----------------------------------------------------------- --%> 52 <%-- --------------------- ORIGINAL FILES ---------------------- --%> 53 <%-- ----------------------------------------------------------- --%> 42 54 <div class="title2" style="float:left"> 43 55 <nested:size id="nbFiles" property="fichiers"/> … … 47 59 </div> 48 60 49 <div style="float:right">50 <a onclick='javascript:neededLogin("/ZipGame.do?path=<%=path%>")' title='<bean:message key="data.access.downloading"/>'>51 <html:img page="/resources/images/utils/text.png" alt="file"/>52 <bean:message arg0="${nomJeu}" key="data.access.files.dowload.zip"/>53 </a>54 </div>55 61 <BR/><BR/> 56 62 … … 68 74 </nested:iterate> 69 75 76 <BR/><BR/> 77 78 <%-- ----------------------------------------------------------- --%> 79 <%-- -------------------- CORRECTED FILES ---------------------- --%> 80 <%-- ----------------------------------------------------------- --%> 81 <div class="title2" style="float:left"> 82 0 <bean:message key="data.access.files4" arg0=""/> 83 <%--<nested:size id="nbFiles" property="fichiers"/>--%> 84 <%--<bean:write name="nbFiles"/>--%> 85 <%--<logic:equal name="nbFiles" value="1"><bean:message key="data.access.files4"/></logic:equal>--%> 86 <%--<logic:notEqual name="nbFiles" value="1"><bean:message key="data.access.files4" arg0="s"/></logic:notEqual>--%> 87 </div> 88 <BR> 89 90 <div class="title3" style="float:left"> 91 (<bean:message key="data.access.metadata.files.corrected.comment"/>) 92 </div> 93 <BR/><BR/> 94 70 95 <div class="hdp" align="right"> 71 96 <html:link href="#top" titleKey="app.hdp"> -
ether_megapoli/trunk/web/data/jeux.jsp
r259 r695 68 68 <logic:greaterThan name="nbFiles" value="0"> 69 69 <a onclick='javascript:neededLogin("/FichiersAccess.do?idJeu=<nested:write property="jeuId"/>")' title='<bean:message key="data.access.download.file"/>'> 70 <bean:write name="nbFiles"/> <bean:message key="data.access.metadata.files "/>70 <bean:write name="nbFiles"/> <bean:message key="data.access.metadata.files.all"/> 71 71 </a> 72 72 </logic:greaterThan> … … 103 103 <logic:greaterThan name="nbFiles" value="0"> 104 104 <a onclick='javascript:neededLogin("/FichiersAccess.do?idJeu=<nested:write property="jeuId"/>")' title='<bean:message key="data.access.download.file"/>'> 105 <bean:write name="nbFiles"/> <bean:message key="data.access.metadata.files "/>105 <bean:write name="nbFiles"/> <bean:message key="data.access.metadata.files.all"/> 106 106 </a> 107 107 </logic:greaterThan> … … 138 138 <logic:greaterThan name="nbFiles" value="0"> 139 139 <a onclick='javascript:neededLogin("/FichiersAccess.do?idJeu=<nested:write property="jeuId"/>")' title='<bean:message key="data.access.download.file"/>'> 140 <bean:write name="nbFiles"/> <bean:message key="data.access.metadata.files "/>140 <bean:write name="nbFiles"/> <bean:message key="data.access.metadata.files.all"/> 141 141 </a> 142 142 </logic:greaterThan> -
ether_megapoli/trunk/web/index.jsp
r430 r695 20 20 21 21 <tiles:put name="body" type="string"> 22 <div id="errors"><img src="resources/images/utils/alert-icon-red_small.png" width="50px"><bean:message key="errors.dataset.dates"/><BR> 23 - LHVP : PILS-IC-LHVP, EC+BC-LSCE-LHVP, PILS-TOC-LHVP, TEOM-FDMS-LHVP, Nephelometer-LHVP<BR> 24 - SIRTA : PILS-SIRTA, Aethalometer-SIRTA, Nephelometer-SIRTA, SMPS-SIRTA, VOC-cartridges-SIRTA, CMS-SIRTA 25 </div> 26 22 27 <center> 23 28 <table width="80%"> -
ether_megapoli/trunk/web/src/ApplicationResources.properties
r566 r695 285 285 data.access.metadata.presentation.contact.role.scientifique=Responsable scientifique 286 286 data.access.metadata.presentation.contact.role.technique=Responsable technique 287 data.access.metadata.files.all=fichier(s) 288 data.access.metadata.files.corrected=fichier(s) avec correction des dates (fichier(s) intégrés en base et utilisés pour l'extraction et la visualisation) 289 data.access.metadata.files.corrected.comment=Si des fichiers corrig\u00E9s existent pour ce jeu, ils ont \u00E9t\u00E9 int\u00E9gr\u00E9s en base et seront donc utilis\u00E9s pour l'extraction et la visualisation 287 290 data.access.metadata.files=fichier(s) d'origine 288 291 data.access.metadata.file=fichier{0} d'origine … … 295 298 data.access.metadata.datefin=Date de la derni\u00E8re mesure 296 299 data.access.metadata.heure=\u00E0 297 data.access.metadata.nbfichiers=Nombre de fichiers d'origine300 data.access.metadata.nbfichiers=Nombre de fichiers 298 301 data.access.metadata.fichierslink=acc\u00E8s aux fichiers 299 302 data.access.metadata.nbmesures=Nombre de mesures … … 314 317 data.access.files2=Fichiers d'origine pour le jeu {0} 315 318 data.access.files3=fichier{0} d'origine 319 data.access.files4=fichier{0} corrig\u00E9{0} 316 320 data.access.extract=Acc\u00E8s aux donn\u00E9es 317 321 data.access.extract.short=Acc\u00E8s … … 443 447 errors.access.novalues=Pas d'extraction possible 444 448 449 450 errors.dataset.dates=Attention, les jeux de donn\u00E9es suivant doivent \u00EAtre retravaill\u00E9s suite \u00E0 un d\u00E9calage de deux jours dans les dates. Soyez vigilants si vous souhaitez les utiliser. 445 451 446 452 ################################################################ … … 549 555 simulation.withRealData.activated=Activ\u00E9 550 556 simulation.noRealData=Pas de donn\u00E9es r\u00E9elles 557 simulation.level.1=~20m 558 simulation.level.2=~80m 559 simulation.level.3=~180m 560 simulation.level.4=~350m 561 simulation.level.5=~650m 562 simulation.level.6=~1200m 563 simulation.level.7=~2200m 564 simulation.level.8=~4200m 551 565 552 566 ################################################################ -
ether_megapoli/trunk/web/src/ApplicationResources_en.properties
r673 r695 286 286 data.access.metadata.presentation.contact.role.scientifique=Principal investigator 287 287 data.access.metadata.presentation.contact.role.technique=Technical manager 288 data.access.metadata.files.all=file(s) 289 data.access.metadata.files.corrected=file(s) with corrected dates 290 data.access.metadata.files.corrected.comment=If corrected files exist for this dataset, they were integrated in database and used for extraction and visualisation 288 291 data.access.metadata.files=original file(s) 289 292 data.access.metadata.file=original file{0} … … 296 299 data.access.metadata.datefin=Date of the last measure 297 300 data.access.metadata.heure=at 298 data.access.metadata.nbfichiers=Number of originalfiles301 data.access.metadata.nbfichiers=Number of files 299 302 data.access.metadata.fichierslink=access to files 300 303 data.access.metadata.nbmesures=Number of measures … … 315 318 data.access.files2=Original files for data set {0} 316 319 data.access.files3=original file{0} 320 data.access.files4=corrected file{0} 317 321 data.access.extract=Data access 318 322 data.access.extract.short=Access … … 443 447 errors.access.failed.sel=You must select at least 1 parameter or 1 sensor or 1 platform or 1 data set 444 448 errors.access.novalues=No download possible 449 450 errors.dataset.dates=Warning, the followed datasets must be reinserted because of a two days offset. Be careful if you still want to work with. 445 451 446 452 ################################################################ … … 550 556 simulation.withRealData.activated=Activated 551 557 simulation.noRealData=No real data 558 simulation.level.1=~20m 559 simulation.level.2=~80m 560 simulation.level.3=~180m 561 simulation.level.4=~350m 562 simulation.level.5=~650m 563 simulation.level.6=~1200m 564 simulation.level.7=~2200m 565 simulation.level.8=~4200m 552 566 553 567 ################################################################ … … 676 690 bo.DOWNLOAD_DIRECTORY_DOESNOT_EXISTS=The download directory doesn't exists ! No move available 677 691 678 bo.insert.text=<ul><li>Modify the database connection in the file hibernate.properties (src/megapoli_insert/src).</li><li>Modify the file build.xml (src/megapoli_insert).</li><li>Modify all files capteurs.xls, parametres.xls, etc... (data/metadata).</li><li>Launch the command ant exec (src/megapoli_insert).</li>< /ul>692 bo.insert.text=<ul><li>Modify the database connection in the file hibernate.properties (src/megapoli_insert/src).</li><li>Modify the file build.xml (src/megapoli_insert).</li><li>Modify all files capteurs.xls, parametres.xls, etc... (data/metadata).</li><li>Launch the command ant exec (src/megapoli_insert).</li><li>Verify the table requete_nbvals_jeu. If values are empty <ul><li>select count(*) from mesure where fichier_id in ()</li><li>select count(*) from valeur where mesure_id in (select mesure_id from mesure where fichier_id in ())</li></ul></li></ul> 679 693 680 694 bo.simulation=Simulation -
ether_megapoli/trunk/web/visualization/visu_simulation-script.jsp
r562 r695 93 93 jQuery.each( this.selectedModel.jsonElement.levels, jQuery.proxy( function ( i, level ) 94 94 { 95 this.selectLevels.add( i, level);95 this.selectLevels.add( i, interfaceTexts["simulation.level." + level] ); 96 96 }, this ) ); 97 97 this.selectLevels.selectFirst( false ); -
ether_megapoli/trunk/web/visualization/visu_simulation.jsp
r565 r695 106 106 interfaceTexts["simulation.raster"] = '<bean:message key="simulation.raster"/>'; 107 107 interfaceTexts["simulation.raster_contour"] = '<bean:message key="simulation.raster_contour"/>'; 108 interfaceTexts["simulation.level.1"] = '<bean:message key="simulation.level.1"/>'; 109 interfaceTexts["simulation.level.2"] = '<bean:message key="simulation.level.2"/>'; 110 interfaceTexts["simulation.level.3"] = '<bean:message key="simulation.level.3"/>'; 111 interfaceTexts["simulation.level.4"] = '<bean:message key="simulation.level.4"/>'; 112 interfaceTexts["simulation.level.5"] = '<bean:message key="simulation.level.5"/>'; 113 interfaceTexts["simulation.level.6"] = '<bean:message key="simulation.level.6"/>'; 114 interfaceTexts["simulation.level.7"] = '<bean:message key="simulation.level.7"/>'; 115 interfaceTexts["simulation.level.8"] = '<bean:message key="simulation.level.8"/>'; 108 116 109 117 new InterfaceSimulation( ${simulations} ); -
ether_megapoli_insert/src/integration/repartition/Repartition.java
r458 r695 969 969 // String codeUniteModele = lectureUnites.getCodesUni().get(indiceUnite); 970 970 // Si les unités sont différentes, il y a une conversion é faire 971 if (!codeUniteParam.equals(codeUniteModele) ) {971 if (!codeUniteParam.equals(codeUniteModele) && null != codeUniteModele) { 972 972 if (codeUniteModele.equals(Constantes.unitePPB) && codeUniteParam.equals(Constantes.unitePPM)) { 973 973 valeurVal = Nombre.divMille(valeurVal);
Note: See TracChangeset
for help on using the changeset viewer.