Changeset 490 for tapas/service

Timestamp:

04/26/12 15:42:13 (12 years ago)

Author:

rboipsl

Message:

ajout onglets

Location:

tapas/service

Files:

• implementation/com/ether/TapasServiceImpl.java (modified) (4 diffs)
• interface/com/ether/TapasService.java (modified) (2 diffs)

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

@@ -43 +43 @@
     {
 
-        final String rootPath = prop.getProperty( "root_file_path" );
-        final String execPath = prop.getProperty( "exec_path" );
+        final String servicePath = prop.getProperty( "service_path" );
+        final String srcPath = prop.getProperty( "src_path" );
+        final String dataPath = prop.getProperty( "data_path" );
+
 
         final String userPath = "";
 
-        final String fichier = rootPath+"/"+user.getLastName()+"/"+"request.xml";
+        final String fichier = servicePath+"/"+user.getLastName()+"/"+"request.xml";
 
         final Element tapas = new Element( "tapas" );
@@ -258 +260 @@
 
             String fileArletty = "", fileECMWF = "";
-            fileArletty = rootPath + "/" + user.getLastName() + "/" + createFileName( iRequest.getObservation().getDate(), "arletty" );
-            fileECMWF = rootPath + "/" + user.getLastName() + "/" + createFileName( iRequest.getObservation().getDate(), "ecmwf" );
+            fileArletty = dataPath + "/" + createFileName( iRequest.getObservation().getDate(), "arletty" );
+            fileECMWF = dataPath + "/" + createFileName( iRequest.getObservation().getDate(), "ecmwf" );
 
             final Element arlettyFile = new Element( "arletty_file" );
@@ -272 +274 @@
         }
 
-        createXMLFile( fichier, document );
-    }
-
-
-    public boolean execAppelQSub( User user, Properties prop )
-            throws ServiceException
-    {
-
-        String commande = prop.getProperty( "root_file_path" )+"/"+user.getLastName()+"/"+prop.getProperty( "process_name" )+" -f request.xml"+" -m "+user.getEmail();
+        String commandePath = servicePath+"/"+user.getLastName()+"/"+fTapas.getId();
+        createXMLFile( document, commandePath );
+
+        //appel a qsub
+        //execAppelQSub( commandePath, user, prop );
+    }
+
+
+    public boolean execAppelQSub( final String commandePath, User user, Properties prop )
+            throws ServiceException
+    {
+        String commande="";
+        //copie run qsub dans repertoire commande
+        commande = "cp "+prop.getProperty( "src_path" )+"/"+prop.getProperty( "process_name" )+" "+commandePath;
+
+        try
+        {
+            EtherHelper.execProcess( commande );
+        }
+        catch( FormattedException e )
+        {
+
+        }
+
+        //execution qsub pour la commande en cours
+        commande = commandePath+"/"+prop.getProperty( "process_name" )+" -f request.xml"+" -m "+user.getEmail();
 
         try
@@ -335 +354 @@
 
 
-    public void createXMLFile( final String fichier, final Document document )
-    {
-        try
-        {
+    public void createXMLFile( final Document document, final String commandePath )
+    {
+        try
+        {
+            //creation repertoire commande
+            try
+            {
+                EtherHelper.execProcess( "mkdir -p "+commandePath );
+            }
+            catch( FormattedException e )
+            {
+
+            }
+
+            final String fichier = commandePath+"/"+"request.xml";
+
             //On utilise ici un affichage classique avec getPrettyFormat()
             final XMLOutputter sortie = new XMLOutputter( Format.getPrettyFormat() );

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

@@ -23 +23 @@
             throws ServiceException;
 
-    public void createXMLFile( final String fichier, final Document document );
+    public void createXMLFile( final Document document, final String commandePath );
 
     public List<Observatory> getAllObservatories() throws ServiceException;
@@ -33 +33 @@
     public String createFileName(String date, String type) throws ServiceException;
 
-    public boolean execAppelQSub( @NotNull final User user, @NotNull final Properties prop ) throws ServiceException;
+    public boolean execAppelQSub( final String commandePath, @NotNull final User user, @NotNull final Properties prop ) throws ServiceException;
 
     Long insertTapasRequest( @NotNull User user ) throws ServiceException;