Changeset 504 for tapas/service

Timestamp:

05/11/12 12:34:56 (12 years ago)

Author:

rboipsl

Message:

ajout champs shortName dans table Observatory
gestion nomenclature fichier donnees arletty et ecmwf
modif width interface

Location:

tapas/service

Files:

• implementation/com/ether/TapasServiceImpl.java (modified) (16 diffs)
• interface/com/ether/TapasService.java (modified) (1 diff)

tapas/service/implementation/com/ether/TapasServiceImpl.java

@@ -26 +26 @@
 import java.io.IOException;
 import java.lang.reflect.Array;
+//import java.sql.Date;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Properties;
@@ -47 +54 @@
         final String dataPath = prop.getProperty( "data_path" );
 
-
         final String userPath = "";
-
         final String fichier = servicePath+"/"+user.getLastName()+"/"+"request.xml";
-
         final Element tapas = new Element( "tapas" );
-        final Element request = new Element( "request" );
+        final List<Element> listRequest = new ArrayList<Element>(fTapas.getRequests().size());
 
         //On crée un nouveau Document JDOM basé sur la racine que l'on vient de créer
@@ -69 +73 @@
         for( final Request iRequest : requests )
         {
+
+            final Element request = new Element( "request" );
             // Id de la request
             final Attribute idR = new Attribute( "Id", iRequest.getId().toString() );
@@ -75 +81 @@
             // PREFERENCES
             final Element preferences = new Element( "preferences" );
+
 
             //format
@@ -83 +90 @@
             format.setText( iRequest.getPreference().getFormat().getSecondValue() );
             preferences.addContent( format );
+
 
             //rayleighExtinction
@@ -204 +212 @@
             for( i = 0; i <= tabMess.length - 1; i++ ) //final String mess : tabMess )
             {
-
                 if( i == tabMess.length - 1 )
                     chValid += EtherHelper.getMessage( "label.spectralUnit." + tabMess[i], null );
@@ -258 +265 @@
 
 
-
-            String fileArletty = "", fileECMWF = "";
-            fileArletty = dataPath + "/" + createFileName( iRequest.getObservation().getDate(), "arletty" );
-            fileECMWF = dataPath + "/" + createFileName( iRequest.getObservation().getDate(), "ecmwf" );
+            String fileArletty = "", fileECMWF = "", shortName="";
+            //rajouter annee/mois
+
+            shortName = obs.getShortName();
+
+            fileArletty = dataPath + "/" + createFileName( iRequest.getObservation().getDate(), "arletty",shortName );
+            fileECMWF = dataPath + "/" + createFileName( iRequest.getObservation().getDate(), "ecmwf", shortName );
 
             final Element arlettyFile = new Element( "arletty_file" );
@@ -271 +281 @@
             atmosphere.addContent( ecmwfFile );
 
-            tapas.addContent( request );
-        }
+            listRequest.add( request );
+        }
+
+        tapas.addContent( listRequest );
 
         String commandePath = servicePath+"/"+user.getLastName()+"/"+fTapas.getId();
@@ -282 +294 @@
 
 
-    public boolean execAppelQSub( final String commandePath, User user, Properties prop )
+    public boolean execAppelQSub( final String repCommande, User user, Properties prop )
             throws ServiceException
     {
         String commande="";
+        String commandePath=prop.getProperty( "service_path" )+"/"+user.getLastName()+"/"+repCommande+"/";
+
         //copie run qsub dans repertoire commande
         commande = "cp "+prop.getProperty( "src_path" )+"/"+prop.getProperty( "process_name" )+" "+commandePath;
@@ -298 +312 @@
         }
 
+        EtherHelper.pause(7000);
+
         //execution qsub pour la commande en cours
         commande = commandePath+"/"+prop.getProperty( "process_name" )+" -f request.xml"+" -m "+user.getEmail();
@@ -310 +326 @@
         }
 
-        return true;
+       //EtherHelper.pause(7000);
+
+       return true;
     }
 
@@ -325 +343 @@
     }                    */
 
-    public String createFileName( String date, String type )
-    {
-
-        String fileName = "test_"+type+"_"+date+".txt";
-
-
-        /*String heure = date.substring( 4, 6 );
-
-        int iheure = Math.abs( Integer.parseInt( heure ) );
-
+    public String createFileName( String date, String type, String nomCourt )
+    {
+        String fileName = "";
+
+        String annee = date.substring( 0, 4 );
+        //String mois = String.valueOf( Integer.parseInt(date.substring(5,7))-1);
+        String mois = date.substring(5,7);
+        String heure = date.substring(11,13);
+        String jour = date.substring(8,10);
+        String ind="";
+
+        Calendar cal = Calendar.getInstance();
+
+        try {
+            Date dd = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").parse(jour+"/"+mois+"/"+annee+" "+heure+":00:00");
+            cal.setTime(dd);
+        }
+        catch( ParseException e ) {
+
+        }
+
+        int iheure = cal.get(Calendar.HOUR_OF_DAY);
 
         if( iheure < 3) ind = "00";
         else if ( iheure >= 21) {
             ind = "00";
+            cal.add(Calendar.DAY_OF_MONTH, +1);
         }
         else if( Math.abs(6-iheure) < 3) ind = "06";
@@ -344 +375 @@
         else if( Math.abs(18 - iheure) < 3 ) ind = "18";
 
-
-        if( type == "arletty" ) fileName = "arletty_" + date + ".txt";
-        else if( type == "ecmwf" ) fileName = "ecmwf_" + date + ".txt";
-        */
-
+        //+1 sur le mois pour recuperer le numero correct du mois considere
+        if (cal.get(Calendar.MONTH)+1 <10) mois="0"+String.valueOf(cal.get(Calendar.MONTH)+1);
+        else mois=""+String.valueOf(cal.get(Calendar.MONTH)+1);
+
+        if (cal.get(Calendar.DAY_OF_MONTH) <10) jour="0"+ cal.get(Calendar.DAY_OF_MONTH);
+        else jour=""+cal.get(Calendar.DAY_OF_MONTH);
+
+        annee=""+cal.get(Calendar.YEAR);
+
+        fileName = "/"+annee+"/"+mois+"/"+jour+"/"+nomCourt+"_"+annee+mois+jour+ind;
+
+        if( type == "arletty" ) fileName = fileName+".arl";
+        else if ( type == "ecmwf" ) fileName = fileName+"_qo3.txt";
 
         return fileName;
@@ -368 +407 @@
             }
 
+            EtherHelper.pause(7000);
+
             final String fichier = commandePath+"/"+"request.xml";
 
@@ -375 +416 @@
             //avec en argument le nom du fichier pour effectuer la sérialisation.
             sortie.output( document, new FileOutputStream( fichier ) );
+
+            //EtherHelper.pause(7000);
+
         }
         catch( java.io.IOException ignored )
@@ -434 +478 @@
 
 
-    // recuperation infos observatoire avec le nom
+    // recuperation infos observatoire avec l'id
     @Nullable
     @Transactional(readOnly = true)

tapas/service/interface/com/ether/TapasService.java

@@ -31 +31 @@
     public Long getNumRequest() throws ServiceException;
 
-    public String createFileName(String date, String type) throws ServiceException;
+    public String createFileName(String date, String type, String shortName) throws ServiceException;
 
     public boolean execAppelQSub( final String commandePath, @NotNull final User user, @NotNull final Properties prop ) throws ServiceException;