Changeset 199


Ignore:
Timestamp:
09/16/11 16:23:06 (13 years ago)
Author:
vmipsl
Message:

Livraison _ confs

Location:
ether_megapoli/trunk
Files:
1 added
3 deleted
14 edited
1 copied

Legend:

Unmodified
Added
Removed

  • ether_megapoli/trunk/build.xml

    r170 r199  
    4141 
    4242<!-- le classpath --> 
    43         <path id="classpath"> 
    44                 <fileset dir="${jars.dir}"/> 
    45                 <pathelement location="${classes.dir}"/> 
     43        <!--<path id="classpath">--> 
     44                <!--<fileset dir="${jars.dir}"/>--> 
     45                <!--<pathelement location="${classes.dir}"/>--> 
    4646                <!-- Ajout pour Hibernate --> 
    4747<!--            <pathelement location="${conf.dir}"/> --> 
    48         </path> 
     48        <!--</path>--> 
    4949 
    5050        <target name="all" /> 

  • ether_megapoli/trunk/domain/interface/com/ether/AxeTypeForFixedPlateform.java

    r171 r199  
    11package com.ether; 
    22 
     3/** 
     4 * User: vmipsl 
     5 * Date: sept. 2011 
     6 */ 
    37public enum AxeTypeForFixedPlateform 
    48{ 

  • ether_megapoli/trunk/domain/interface/com/ether/AxeTypeForMobilePlateform.java

    r194 r199  
    11package com.ether; 
    22 
     3/** 
     4 * User: vmipsl 
     5 * Date: sept. 2011 
     6 */ 
    37public enum AxeTypeForMobilePlateform 
    48{ 

  • ether_megapoli/trunk/persistence/implementation/com/ether/dao/ValueDAOImpl.java

    r194 r199  
    22 
    33import com.ether.Data; 
     4import com.ether.Pair; 
    45import com.ether.PersistenceException; 
    56import com.medias.Nombre; 
    … …  
    8586                .add( Projections.property( "localisation.localisationLon" ) ) ) ); 
    8687 
    87         criteria.addOrder( Order.asc( "localisation.localisationLon" ) ); 
     88        criteria.addOrder( Order.asc( "measure.mesureDate" ) ); 
    8889 
    8990        final List<Object[]> objects = selectAllByCriteria( Object[].class, criteria ); 
    … …  
    135136        final List<Double> parameterValues = new ArrayList<Double>( objects.size() ); 
    136137 
    137         int i = 0; 
     138        final List<Pair<Double, Double>> latLonList = new ArrayList<Pair<Double, Double>>(); 
    138139        for( final Object[] value : objects ) 
    139140        { 
    140             parameterValues.add( (Double) value[0] ); 
    141             latitudeValues.add( Double.valueOf( Nombre.latIntToFloat( (Integer) value[1] ) ) ); 
    142             longitudeValues.add( Double.valueOf( Nombre.latIntToFloat( (Integer) value[2] ) ) ); 
    143             i++; 
     141            final Double latitude = Double.valueOf( Nombre.latIntToFloat( (Integer) value[1] ) ); 
     142            final Double longitude = Double.valueOf( Nombre.latIntToFloat( (Integer) value[2] ) ); 
     143 
     144            final Pair<Double, Double> latLon = new Pair( latitude, longitude ); 
     145            if( !latLonList.contains( latLon ) ) 
     146            { 
     147                parameterValues.add( (Double) value[0] ); 
     148                latitudeValues.add( latitude ); 
     149                longitudeValues.add( longitude ); 
     150                latLonList.add( latLon ); 
     151            } 
     152            else 
     153            { 
     154                final String pif = "paf"; 
     155            } 
    144156        } 
    145157 

  • ether_megapoli/trunk/persistence/implementation/hibernate-domain.cfg.xml

    r186 r199  
    77        <session-factory> 
    88 
    9         <!--<mapping resource="com/medias/objects/Adresse.hbm.xml"/>--> 
    10         <!--<mapping resource="com/medias/objects/Bilan.hbm.xml"/>--> 
    11         <!--<mapping resource="com/medias/objects/Capteur.hbm.xml"/>--> 
    12         <!--<mapping resource="com/medias/objects/Categorie.hbm.xml"/>--> 
    13         <!--<mapping resource="com/medias/objects/CategorieParam.hbm.xml"/>--> 
    14         <!--<mapping resource="com/medias/objects/Commentaire.hbm.xml"/>--> 
    15         <!--<mapping resource="com/medias/objects/DeltaMesure.hbm.xml"/>--> 
    16         <!--<mapping resource="com/medias/objects/Fabriquant.hbm.xml"/>--> 
    17         <!--<mapping resource="com/medias/objects/Fichier.hbm.xml"/>--> 
    18         <!--<mapping resource="com/medias/objects/Flag.hbm.xml"/>--> 
    19         <!--<mapping resource="com/medias/objects/Jeu.hbm.xml"/>--> 
    20         <!--<mapping resource="com/medias/objects/Langue.hbm.xml"/>--> 
    21         <!--<mapping resource="com/medias/objects/Localisation.hbm.xml"/>--> 
    22         <!--<mapping resource="com/medias/objects/Mesure.hbm.xml"/>--> 
    23         <!--<mapping resource="com/medias/objects/Organisme.hbm.xml"/>--> 
    24         <!--<mapping resource="com/medias/objects/Parametre.hbm.xml"/>--> 
    25         <!--<mapping resource="com/medias/objects/Personne.hbm.xml"/>--> 
    26         <!--<mapping resource="com/medias/objects/Plateforme.hbm.xml"/>--> 
    27         <!--<mapping resource="com/medias/objects/RequeteNbvalsJeu.hbm.xml"/>--> 
    28         <!--<mapping resource="com/medias/objects/RequetePlatLoc.hbm.xml"/>--> 
    29         <!--<mapping resource="com/medias/objects/Sequence.hbm.xml"/>--> 
    30         <!--<mapping resource="com/medias/objects/TypeCapteur.hbm.xml"/>--> 
    31         <!--<mapping resource="com/medias/objects/TypePlateforme.hbm.xml"/>--> 
    32         <!--<mapping resource="com/medias/objects/Unite.hbm.xml"/>--> 
    33         <!--<mapping resource="com/medias/objects/Valeur.hbm.xml"/>--> 
    34         <!--<mapping resource="com/medias/objects/Zone.hbm.xml"/>--> 
     9        <mapping resource="com/medias/objects/Adresse.hbm.xml"/> 
     10        <mapping resource="com/medias/objects/Bilan.hbm.xml"/> 
     11        <mapping resource="com/medias/objects/Capteur.hbm.xml"/> 
     12        <mapping resource="com/medias/objects/Categorie.hbm.xml"/> 
     13        <mapping resource="com/medias/objects/CategorieParam.hbm.xml"/> 
     14        <mapping resource="com/medias/objects/Commentaire.hbm.xml"/> 
     15        <mapping resource="com/medias/objects/DeltaMesure.hbm.xml"/> 
     16        <mapping resource="com/medias/objects/Fabriquant.hbm.xml"/> 
     17        <mapping resource="com/medias/objects/Fichier.hbm.xml"/> 
     18        <mapping resource="com/medias/objects/Flag.hbm.xml"/> 
     19        <mapping resource="com/medias/objects/Jeu.hbm.xml"/> 
     20        <mapping resource="com/medias/objects/Langue.hbm.xml"/> 
     21        <mapping resource="com/medias/objects/Localisation.hbm.xml"/> 
     22        <mapping resource="com/medias/objects/Mesure.hbm.xml"/> 
     23        <mapping resource="com/medias/objects/Organisme.hbm.xml"/> 
     24        <mapping resource="com/medias/objects/Parametre.hbm.xml"/> 
     25        <mapping resource="com/medias/objects/Personne.hbm.xml"/> 
     26        <mapping resource="com/medias/objects/Plateforme.hbm.xml"/> 
     27        <mapping resource="com/medias/objects/RequeteNbvalsJeu.hbm.xml"/> 
     28        <mapping resource="com/medias/objects/RequetePlatLoc.hbm.xml"/> 
     29        <mapping resource="com/medias/objects/Sequence.hbm.xml"/> 
     30        <mapping resource="com/medias/objects/TypeCapteur.hbm.xml"/> 
     31        <mapping resource="com/medias/objects/TypePlateforme.hbm.xml"/> 
     32        <mapping resource="com/medias/objects/Unite.hbm.xml"/> 
     33        <mapping resource="com/medias/objects/Valeur.hbm.xml"/> 
     34        <mapping resource="com/medias/objects/Zone.hbm.xml"/> 
    3535 
    3636        </session-factory> 

  • ether_megapoli/trunk/persistence/implementation/hibernate.cfg.xml

    r154 r199  
    1717                                <prop key="hibernate.bytecode.use_reflection_optimizer">false</prop> 
    1818                                <prop key="hibernate.connection.driver_class">org.postgresql.Driver</prop> 
    19                                 <prop key="hibernate.connection.url">jdbc:postgresql://darkstar.ipslnet:5432/MEGAPOLI_VM3</prop> 
    20 <!--                            <prop key="hibernate.connection.url">jdbc:postgresql://darkstar.ipslnet:5432/NAFE_TEST</prop>--> 
     19                                <!--<prop key="hibernate.connection.url">jdbc:postgresql://darkstar.ipslnet:5432/megapoli_2</prop>--> 
     20                                <prop key="hibernate.connection.url">jdbc:postgresql://darkstar.private.ipsl.fr:5432/megapoli_2</prop> 
    2121                                <prop key="hibernate.connection.username">postgres</prop> 
    2222                                <prop key="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</prop> 

  • ether_megapoli/trunk/persistence/implementation/hibernate.properties

    r171 r199  
    11hibernate.connection.driver_class = org.postgresql.Driver 
    2 hibernate.connection.url=jdbc:postgresql://darkstar.ipslnet:5432/MEGAPOLI_VM3 
     2hibernate.connection.url=jdbc:postgresql://darkstar.private.ipsl.fr:5432/megapoli_2 
    33hibernate.connection.username=postgres 
    44#hibernate.c3p0.min_size=5 

  • ether_megapoli/trunk/service/implementation/com/ether/BouchonHelper.java

    r195 r199  
    1616import java.util.TimeZone; 
    1717 
     18/** 
     19 * @author vmipsl 
     20 * @date sept. 2011 
     21 */ 
    1822public class BouchonHelper 
    1923{ 

  • ether_megapoli/trunk/web/WEB-INF/megapoli.properties

    r140 r199  
    11#les path d'acces aux données 
    2 data.upload.root=/home_local/PROJETS/MEGAPOLI/megapoli/data/upload 
    3 data.access.root=/home_local/PROJETS/MEGAPOLI/megapoli/data/download 
    4 data.upload.desc=/home_local/PROJETS/MEGAPOLI/megapoli/data/xml/uploadHierarchie.xml 
    5 data.access.desc=/home_local/PROJETS/MEGAPOLI/megapoli/data/xml/accessHierarchie.xml 
    6 annuaire=/home_local/PROJETS/MEGAPOLI/megapoli/data/xml/annuaire.xml 
     2data.upload.root=/www/Megapoli/megapoli_data/data/upload 
     3data.access.root=/www/Megapoli/megapoli_data/data/download 
     4data.upload.desc=/www/Megapoli/megapoli_data/data/xml/uploadHierarchie.xml 
     5data.access.desc=/www/Megapoli/megapoli_data/data/xml/accessHierarchie.xml 
     6annuaire=/usr/local/megapoli/annuaire.xml 
    77 
    88#le path d'accÚs aux images 
    9 data.img=/home_local/PROJETS/MEGAPOLI/megapoli/data/images 
     9data.img=/www/Megapoli/megapoli_data/data/images 
    1010 
    1111#le serveur mail 
    1212mail.host=vmipsl@ipsl.jussieu.fr 
    1313mail.webmaster=vmipsl@ipsl.jussieu.fr 
    14 url.upload=http://localhost:8080/megapoli/InitLogon.do 
    15 url.extractcgi=http://medias3.mediasfrance.org/megapoli_data/cgi-bin/megapoli_extract.cgi 
     14url.upload=http://chewie.private.ipsl.fr:8080/megapoli/InitLogon.do 
     15url.extractcgi=http://chewie.private.ipsl.fr/cgi-bin/megapoli_extract.cgi 
    1616 
    1717#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 

  • ether_megapoli/trunk/web/WEB-INF/megapoli_local.properties

    r160 r199  
    1313mail.webmaster=vmipsl@ipsl.jussieu.fr 
    1414url.upload=http://localhost:8080/megapoli/InitLogon.do 
    15 url.extractcgi=http://medias3.mediasfrance.org/megapoli_data/cgi-bin/megapoli_extract.cgi 
     15url.extractcgi=http://localhost:8080/megapoli_data/cgi-bin/megapoli_extract.cgi 
    1616 
    1717#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 

  • ether_megapoli/trunk/web/WEB-INF/web.xml

    r146 r199  
    88    </welcome-file-list> 
    99 
     10    <!--<context-param>--> 
     11        <!--<param-name>contextConfigLocation</param-name>--> 
     12        <!--<param-value>--> 
     13            <!--classpath:hibernate.cfg.xml,--> 
     14            <!--classpath:dao-context.xml,--> 
     15            <!--classpath:service-context.xml,--> 
     16<!----> 
     17            <!--classpath:json/json-context.xml--> 
     18        <!--</param-value>--> 
     19    <!--</context-param>--> 
     20 
    1021    <context-param> 
    1122        <param-name>contextConfigLocation</param-name> 
    1223        <param-value> 
    13             classpath:dao-context.xml, 
    14             classpath:service-context.xml, 
    15             classpath:hibernate.cfg.xml, 
     24            /WEB-INF/classes/hibernate.cfg.xml, 
     25            /WEB-INF/classes/dao-context.xml, 
     26            /WEB-INF/classes/service-context.xml, 
    1627 
    17             classpath:json/json-context.xml 
     28            /WEB-INF/classes/json/json-context.xml 
    1829        </param-value> 
    1930    </context-param> 

  • ether_megapoli/trunk/web/src/ApplicationResources.properties

    r198 r199  
    471471data.visualization.parameter=param\u00E8tre(s) 
    472472data.visualization.parameter.buttons.help=Aide 
    473 data.visualization.parameter.buttons.help.text=En cliquant sur 'Ajouter', vous int\u00E9grez le param\u00E8tre s\u00E9lectionn\u00E9 au quicklook final. Vous ne pouvez visualiser que deux types de param\u00E9tres diff\u00E8rents sur autant de plateformes souhait\u00E8es.<BR><BR>Le bouton 'Initialiser' vide la liste des param\u00E8tres. 
     473data.visualization.parameter.buttons.help.text=En cliquant sur 'Ajouter', vous int\u00E9grez le param\u00E8tre s\u00E9lectionn\u00E9 au quicklook final. Pour une s\u00E8rie temporelle, vous pouvez visualiser jusqu'\u00E0 deux types de param\u00E9tres diff\u00E8rents sur autant de plateformes souhait\u00E8es.Pour un 2D par contre, un seul param\u00E9tre est visualisable.<BR><BR>Le bouton 'Initialiser' vide la liste des param\u00E8tres. 
    474474 
    475475data.visualization.axeType.TimeLine=S\u00E9rie temporelle (ligne) 

  • ether_megapoli/trunk/web/src/ApplicationResources_en.properties

    r198 r199  
    470470data.visualization.parameter=parameter(s) 
    471471data.visualization.parameter.buttons.help=Help 
    472 data.visualization.parameter.buttons.help.text=By clicking on 'Add' you add the selected parameter to the final quicklook. You can visualize up to two differents parameters at the same time for many plateforms.<BR><BR>The button 'Init' remove the parameters from the list. 
     472data.visualization.parameter.buttons.help.text=By clicking on 'Add' you add the selected parameter to the final quicklook. For a time serie you can visualize up to two differents parameters at the same time for many plateforms.For a 2D only one parameter is available.<BR><BR>The button 'Init' remove the parameters from the list. 
    473473 
    474474data.visualization.axeType.TimeLine=Time serie (line) 

  • ether_megapoli/trunk/web/src/com/ether/ControllerPlot.java

    r197 r199  
    106106                megapoliPlot.setTimeSerie( true ); 
    107107                megapoliPlot.setLegendToHide( pIdPIdList.size() == 1 ); 
    108 //                megapoliPlot.setValuesNumber( 10 ); 
    109108            } 
    110109            else 

  • ether_megapoli/trunk/web/visualization/visu_parameter_by_pf-script.jsp

    r198 r199  
    432432    this.helpWindow.setTitle( interfaceTexts["data.visualization.parameter.buttons.help"] ); 
    433433    this.helpWindow.getContent().innerHTML = '<div class="textExamplesTD">' + interfaceTexts["data.visualization.parameter.buttons.help.text"] + '</div>'; 
    434     this.helpWindow.setSize( 300, 80 ); 
     434    this.helpWindow.setSize( 350, 100 ); 
    435435    this.helpWindow.show(); 
    436436} 
Note: See TracChangeset for help on using the changeset viewer.