Changeset 216 for ether_megapoli

Timestamp:

10/04/11 16:26:26 (13 years ago)

Author:

vmipsl

Message:

download

Location:

ether_megapoli/trunk

Files:

• common/implementation/com/ether/DateHelper.java (modified) (3 diffs)
• common/implementation/com/ether/EtherHelper.java (modified) (4 diffs)
• web/src/com/ether/Controller.java (modified) (5 diffs)
• web/src/com/ether/ControllerPlot.java (modified) (2 diffs)

ether_megapoli/trunk/common/implementation/com/ether/DateHelper.java

@@ -1 +1 @@
 package com.ether;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jetbrains.annotations.Nullable;
 
 import java.text.DateFormat;
@@ -7 +11 @@
 import java.util.Date;
 import java.util.Locale;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jetbrains.annotations.Nullable;
 
 /**
@@ -132 +132 @@
 
     @Nullable
-    public static Date parseDate( @Nullable final String date, final String format ) throws ParseException
+    public static Date parseDate( @Nullable final String date, final String format )
+            throws ParseException
     {
-        if( date == null )
+        if( date == null )
             return null;
 
         final SimpleDateFormat simpleDateFormat = new SimpleDateFormat( format );
-        return simpleDateFormat.parse(date);
+        return simpleDateFormat.parse( date );
     }
 
     private static final Log LOGGER = LogFactory.getLog( DateHelper.class );
-    
+
     public static final String FRENCH_DATE_PATTERN_SHORT = "dd/MM/yyyy";
+    public static final String FRENCH_DATE_PATTERN = "dd/MM/yyyy HH:mm";
     public static final String ENGLISH_DATE_PATTERN_SHORT = "yyyy-MM-dd";
     public static final String ENGLISH_DATE_PATTERN = "yyyy-MM-dd HH:mm";

ether_megapoli/trunk/common/implementation/com/ether/EtherHelper.java

@@ -5 +5 @@
 import org.jetbrains.annotations.Nullable;
 
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -63 +66 @@
     // TODO : supprimer cette méthode et utiliser JSON pour récupérer pIdPIdList
     @Nullable
-    public static List<Pair<Integer, Integer>> extractpfIdPIdListFromString( @NotNull final String pfIdPIdArrayString )
+    public static <T1 extends Object, T2 extends Object> List<Pair<T1, T2>> extractpfIdPIdListFromString( @NotNull final String pfIdPIdArrayString, @NotNull final Class<T1> T1Class, @NotNull final Class<T2> T2Class )
     {
         if( pfIdPIdArrayString.isEmpty() )
@@ -69 +72 @@
 
         final String[] pfIDPIdArray = pfIdPIdArrayString.split( "," );
-        final List<Pair<Integer, Integer>> pfIdPIdList = new ArrayList<Pair<Integer, Integer>>( pfIDPIdArray.length );
+        final List<Pair<T1, T2>> pfIdPIdList = new ArrayList<Pair<T1, T2>>( pfIDPIdArray.length );
         for( final String pfIdPId : pfIDPIdArray )
         {
             final String[] pfIdPIdSplit = pfIdPId.split( "-" );
-            final Pair<Integer, Integer> pfIdPIdPair = new Pair<Integer, Integer>();
-            pfIdPIdPair.setFirstValue( Integer.valueOf( pfIdPIdSplit[0] ) );
-            pfIdPIdPair.setSecondValue( Integer.valueOf( pfIdPIdSplit[1] ) );
+            final Pair<T1, T2> pfIdPIdPair = new Pair<T1, T2>();
+            if( T1Class.equals( String.class ) )
+                pfIdPIdPair.setFirstValue( (T1) pfIdPIdSplit[0] );
+            else
+                pfIdPIdPair.setFirstValue( (T1) Integer.valueOf( pfIdPIdSplit[0] ) );
+
+            if( T2Class.equals( String.class ) )
+                pfIdPIdPair.setSecondValue( (T2) pfIdPIdSplit[1] );
+            else
+                pfIdPIdPair.setSecondValue( (T2) Integer.valueOf( pfIdPIdSplit[1] ) );
             pfIdPIdList.add( pfIdPIdPair );
         }
@@ -81 +91 @@
     }
 
+    /**
+     * This method writes the text into the file filePath
+     *
+     * @param filePath
+     * @param text
+     */
+    public static void writeInFile( @NotNull final String filePath, @NotNull final String text )
+    {
+        try
+        {
+            final FileWriter fw = new FileWriter( filePath, true );
+            final BufferedWriter output = new BufferedWriter( fw );
+            output.write( text );
+            output.flush();
+            output.close();
+        }
+        catch( IOException ioe )
+        {
+            ioe.printStackTrace();
+        }
+
+    }
 
 }

ether_megapoli/trunk/web/src/com/ether/Controller.java

@@ -8 +8 @@
 import com.medias.database.objects.Plateforme;
 import com.medias.megapoli.struts.forms.DatasForm;
+import com.medias.megapoli.trade.MesureAdapter;
+import com.medias.megapoli.trade.ValeurAdapter;
 import com.medias.megapoli.utils.Requete;
 import net.sf.json.JSONObject;
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -79 +80 @@
             throws ServiceException, WebException
     {
-        final List<Pair<Integer, Integer>> pfIdPIdList = EtherHelper.extractpfIdPIdListFromString( pIdPIdArrayString );
+        final List<Pair<String, String>> pfIdPIdList = EtherHelper.extractpfIdPIdListFromString( pIdPIdArrayString, String.class, String.class );
         if( null == pfIdPIdList )
             throw new WebException( WebException.WebCode.PLATEFORM_OR_PARAMETER_IS_NULL, null );
 
-        final DatasForm datasForm = new DatasForm();
-        datasForm.setOutput( FORMAT_DEFAULT );
-        datasForm.setCompression( COMPRESSION_DEFAULT );
-        final List<Integer> plateformIds = EtherHelper.getFirstValues( pfIdPIdList );
-        final List<Integer> parameterIds = EtherHelper.getSecondValues( pfIdPIdList );
-        final String plateformIdsString = StringUtils.join( plateformIds.iterator(), "," );
-        final String parameterIdsString = StringUtils.join( parameterIds.iterator(), "," );
-
-        final Calendar calendar = Calendar.getInstance();
-        String formatedDateBegin = null;
-        String formatedDateEnd = null;
-        if( null != dateBegin && null != dateEnd && !"false".equals( dateBegin ) && !"false".equals( dateEnd ) )
-            try
-            {
-                calendar.setTimeInMillis( Long.valueOf( dateBegin ) );
-                formatedDateBegin = DateHelper.formatDate( calendar.getTime(), DateHelper.FRENCH_DATE_PATTERN_SHORT );
-                calendar.setTimeInMillis( Long.valueOf( dateEnd ) );
-                formatedDateEnd = DateHelper.formatDate( calendar.getTime(), DateHelper.FRENCH_DATE_PATTERN_SHORT );
-            }
-            catch( Exception e )
-            {
-                throw new WebException( WebException.WebCode.INVALID_DATE, e );
-            }
-
-        final String datesString = StringUtils.join( new String[]{formatedDateBegin, formatedDateEnd}, "," );
-
-        datasForm.setListePlats( plateformIdsString );
-        datasForm.setListeParams( parameterIdsString );
-        datasForm.setListeDates( datesString );
+        final DatasForm dataForm = createDataForm( dateBegin, dateEnd, pfIdPIdList );
 
         final XMLOutputter outXml = new XMLOutputter();
-        final Document docXml = Requete.toXml( datasForm, personne );
+        final Document docXml = Requete.toXml( dataForm, personne );
         final String requete = outXml.outputString( docXml );
         try
@@ -126 +99 @@
             conn.setUseCaches( false );
             conn.setRequestProperty( "content-type", "application/x-www-form-urlencoded" );
+
             // Envoi de la requête
             final DataOutputStream out = new DataOutputStream( conn.getOutputStream() );
@@ -143 +117 @@
                 }
                 else System.out.println( "REPONSE :" + aLine );
-
             }
         }
@@ -170 +143 @@
     }
 
+    /**
+     * This method create a dataForms to simulate and use the struts actions "DataAccessAction" and "DataSubmitAction"
+     *
+     * @param dateBegin
+     * @param dateEnd
+     * @param pfIdPIdList
+     * @return
+     * @throws WebException
+     */
+    @NotNull
+    private DatasForm createDataForm( final String dateBegin, final String dateEnd, final List<Pair<String, String>> pfIdPIdList )
+            throws WebException
+    {
+        final DatasForm dataForm = new DatasForm();
+
+        // Plateforms and parameters
+        final List<String> plateformIds = EtherHelper.getFirstValues( pfIdPIdList );
+        final List<String> parameterIds = EtherHelper.getSecondValues( pfIdPIdList );
+        dataForm.setSelectPlats( plateformIds.toArray( new String[plateformIds.size()] ) );
+        dataForm.setSelectParams( parameterIds.toArray( new String[parameterIds.size()] ) );
+
+        // Localisations
+        final MesureAdapter mAdapter = new MesureAdapter();
+        mAdapter.loadLocsFromDatabase( dataForm );
+
+        // Dates
+        final Calendar calendar = Calendar.getInstance();
+        String formatedDateBegin = null;
+        String formatedDateEnd = null;
+        if( null != dateBegin && null != dateEnd && !"false".equals( dateBegin ) && !"false".equals( dateEnd ) )
+        {
+            try
+            {
+                calendar.setTimeInMillis( Long.valueOf( dateBegin ) );
+                formatedDateBegin = DateHelper.formatDate( calendar.getTime(), DateHelper.FRENCH_DATE_PATTERN );
+                calendar.setTimeInMillis( Long.valueOf( dateEnd ) );
+                formatedDateEnd = DateHelper.formatDate( calendar.getTime(), DateHelper.FRENCH_DATE_PATTERN );
+                dataForm.setDateDeb( formatedDateBegin );
+                dataForm.setDateFin( formatedDateEnd );
+            }
+            catch( Exception e )
+            {
+                throw new WebException( WebException.WebCode.INVALID_DATE, e );
+            }
+        }
+        else
+            mAdapter.loadDatesFromDatabase( dataForm );
+
+        // Fill dataForm
+        final ValeurAdapter vAdapter = new ValeurAdapter();
+        vAdapter.loadCountFromDatabase( dataForm );
+        dataForm.setListeCoords( dataForm.getLatMin() + "," + dataForm.getLatMax() + "," + dataForm.getLonMin() + "," + dataForm.getLonMax() );
+        dataForm.setListeDates( dataForm.getDateDeb() + "," + dataForm.getDateFin() );
+
+        return dataForm;
+    }
+
     private List<JSONObject> getJSONAxeTypesForFixedPlateforms()
     {

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

@@ -2 +2 @@
 
 import com.medias.Context;
+import gov.noaa.pmel.util.SoTValue;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -65 +66 @@
             // TODO : utiliser JSON pour récupérer pIdPIdList
             final String pIdPIdArrayString = request.getParameter( ParameterConstants.PARAMETER_PFID_PID_LIST );
-            final List<Pair<Integer, Integer>> pIdPIdList = EtherHelper.extractpfIdPIdListFromString( pIdPIdArrayString );
+            final List<Pair<Integer, Integer>> pIdPIdList = EtherHelper.extractpfIdPIdListFromString( pIdPIdArrayString, Integer.class, Integer.class );
             if( null == pIdPIdList )
             {