Changeset 199 for ether_megapoli/trunk/persistence

Timestamp:

09/16/11 16:23:06 (13 years ago)

Author:

vmipsl

Message:

Livraison _ confs

Location:

ether_megapoli/trunk/persistence/implementation

Files:

• com/ether/dao/ValueDAOImpl.java (modified) (3 diffs)
• hibernate-domain.cfg.xml (modified) (1 diff)
• hibernate.cfg.xml (modified) (1 diff)
• hibernate.properties (modified) (1 diff)

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

@@ -2 +2 @@
 
 import com.ether.Data;
+import com.ether.Pair;
 import com.ether.PersistenceException;
 import com.medias.Nombre;
@@ -85 +86 @@
                 .add( Projections.property( "localisation.localisationLon" ) ) ) );
 
-        criteria.addOrder( Order.asc( "localisation.localisationLon" ) );
+        criteria.addOrder( Order.asc( "measure.mesureDate" ) );
 
         final List<Object[]> objects = selectAllByCriteria( Object[].class, criteria );
@@ -135 +136 @@
         final List<Double> parameterValues = new ArrayList<Double>( objects.size() );
 
-        int i = 0;
+        final List<Pair<Double, Double>> latLonList = new ArrayList<Pair<Double, Double>>();
         for( final Object[] value : objects )
         {
-            parameterValues.add( (Double) value[0] );
-            latitudeValues.add( Double.valueOf( Nombre.latIntToFloat( (Integer) value[1] ) ) );
-            longitudeValues.add( Double.valueOf( Nombre.latIntToFloat( (Integer) value[2] ) ) );
-            i++;
+            final Double latitude = Double.valueOf( Nombre.latIntToFloat( (Integer) value[1] ) );
+            final Double longitude = Double.valueOf( Nombre.latIntToFloat( (Integer) value[2] ) );
+
+            final Pair<Double, Double> latLon = new Pair( latitude, longitude );
+            if( !latLonList.contains( latLon ) )
+            {
+                parameterValues.add( (Double) value[0] );
+                latitudeValues.add( latitude );
+                longitudeValues.add( longitude );
+                latLonList.add( latLon );
+            }
+            else
+            {
+                final String pif = "paf";
+            }
         }
 

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

@@ -7 +7 @@
         <session-factory>
 
-        <!--<mapping resource="com/medias/objects/Adresse.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Bilan.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Capteur.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Categorie.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/CategorieParam.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Commentaire.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/DeltaMesure.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Fabriquant.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Fichier.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Flag.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Jeu.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Langue.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Localisation.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Mesure.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Organisme.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Parametre.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Personne.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Plateforme.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/RequeteNbvalsJeu.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/RequetePlatLoc.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Sequence.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/TypeCapteur.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/TypePlateforme.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Unite.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Valeur.hbm.xml"/>-->
-        <!--<mapping resource="com/medias/objects/Zone.hbm.xml"/>-->
+        <mapping resource="com/medias/objects/Adresse.hbm.xml"/>
+        <mapping resource="com/medias/objects/Bilan.hbm.xml"/>
+        <mapping resource="com/medias/objects/Capteur.hbm.xml"/>
+        <mapping resource="com/medias/objects/Categorie.hbm.xml"/>
+        <mapping resource="com/medias/objects/CategorieParam.hbm.xml"/>
+        <mapping resource="com/medias/objects/Commentaire.hbm.xml"/>
+        <mapping resource="com/medias/objects/DeltaMesure.hbm.xml"/>
+        <mapping resource="com/medias/objects/Fabriquant.hbm.xml"/>
+        <mapping resource="com/medias/objects/Fichier.hbm.xml"/>
+        <mapping resource="com/medias/objects/Flag.hbm.xml"/>
+        <mapping resource="com/medias/objects/Jeu.hbm.xml"/>
+        <mapping resource="com/medias/objects/Langue.hbm.xml"/>
+        <mapping resource="com/medias/objects/Localisation.hbm.xml"/>
+        <mapping resource="com/medias/objects/Mesure.hbm.xml"/>
+        <mapping resource="com/medias/objects/Organisme.hbm.xml"/>
+        <mapping resource="com/medias/objects/Parametre.hbm.xml"/>
+        <mapping resource="com/medias/objects/Personne.hbm.xml"/>
+        <mapping resource="com/medias/objects/Plateforme.hbm.xml"/>
+        <mapping resource="com/medias/objects/RequeteNbvalsJeu.hbm.xml"/>
+        <mapping resource="com/medias/objects/RequetePlatLoc.hbm.xml"/>
+        <mapping resource="com/medias/objects/Sequence.hbm.xml"/>
+        <mapping resource="com/medias/objects/TypeCapteur.hbm.xml"/>
+        <mapping resource="com/medias/objects/TypePlateforme.hbm.xml"/>
+        <mapping resource="com/medias/objects/Unite.hbm.xml"/>
+        <mapping resource="com/medias/objects/Valeur.hbm.xml"/>
+        <mapping resource="com/medias/objects/Zone.hbm.xml"/>
 
         </session-factory>

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

@@ -17 +17 @@
                                 <prop key="hibernate.bytecode.use_reflection_optimizer">false</prop>
                                 <prop key="hibernate.connection.driver_class">org.postgresql.Driver</prop>
-                                <prop key="hibernate.connection.url">jdbc:postgresql://darkstar.ipslnet:5432/MEGAPOLI_VM3</prop>
-<!--                            <prop key="hibernate.connection.url">jdbc:postgresql://darkstar.ipslnet:5432/NAFE_TEST</prop>-->
+                                <!--<prop key="hibernate.connection.url">jdbc:postgresql://darkstar.ipslnet:5432/megapoli_2</prop>-->
+                                <prop key="hibernate.connection.url">jdbc:postgresql://darkstar.private.ipsl.fr:5432/megapoli_2</prop>
                                 <prop key="hibernate.connection.username">postgres</prop>
                                 <prop key="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</prop>

ether_megapoli/trunk/persistence/implementation/hibernate.properties

@@ -1 +1 @@
 hibernate.connection.driver_class = org.postgresql.Driver
-hibernate.connection.url=jdbc:postgresql://darkstar.ipslnet:5432/MEGAPOLI_VM3
+hibernate.connection.url=jdbc:postgresql://darkstar.private.ipsl.fr:5432/megapoli_2
 hibernate.connection.username=postgres
 #hibernate.c3p0.min_size=5