Changeset 507 for tapas/service

Timestamp:

05/14/12 17:44:52 (12 years ago)

Author:

rboipsl

Message:

correction structure fichier xml
creation repertoire user

Location:

tapas/service

Files:

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

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

@@ -46 +46 @@
 {
     @Transactional(readOnly = true)
-    public void createXMLRequest( @NotNull final Tapas fTapas, @NotNull final User user, @NotNull final Properties prop )
+    public void createXMLRequest( @NotNull final Tapas fTapas, @NotNull final Properties prop )
             throws ServiceException
     {
@@ -54 +54 @@
         final String dataPath = prop.getProperty( "data_path" );
 
-        final String userPath = "";
-        final String fichier = servicePath+"/"+user.getLastName()+"/"+"request.xml";
+        final String fichier = servicePath+"/"+"request.xml";
         final Element tapas = new Element( "tapas" );
         final List<Element> listRequest = new ArrayList<Element>(fTapas.getRequests().size());
@@ -63 +62 @@
 
         //recuperation valeur id requete (bdd table tapas_request)
-        fTapas.setId( "ETHER_TAPAS_" + String.valueOf( getNumRequest() ) );
+        fTapas.setId( "Ether_TAPAS_" + String.valueOf( getNumRequest() ) );
 
         final Attribute id = new Attribute( "Id", fTapas.getId() );
@@ -86 +85 @@
             final Element format = new Element( "format" );
             //final Attribute validF = new Attribute( "valid", iRequest.getPreference().getFormat().getFirstValue() );
-            final Attribute validF = new Attribute( "valid", "ACII,FITS,NETCDF" );
+            final Attribute validF = new Attribute( "valid", "ASCII,FITS,NETCDF" );
             format.setAttribute( validF );
             format.setText( iRequest.getPreference().getFormat().getSecondValue() );
@@ -107 +106 @@
             preferences.addContent( h2oe );
 
-            //o2
-            final Element o2e = new Element( "o2_extinction" );
-            validR = new Attribute( "valid", "YES,NO" );
-            o2e.setAttribute( validR );
-            o2e.setText( iRequest.getPreference().getO2Extinction().getSecondValue() );
-            preferences.addContent( o2e );
 
             //o3
@@ -121 +114 @@
             preferences.addContent( o3e );
 
+           //o2
+            final Element o2e = new Element( "o2_extinction" );
+            validR = new Attribute( "valid", "YES,NO" );
+            o2e.setAttribute( validR );
+            o2e.setText( iRequest.getPreference().getO2Extinction().getSecondValue() );
+            preferences.addContent( o2e );
+
+
             //co2
             final Element co2e = new Element( "co2_extinction" );
@@ -161 +162 @@
 
             final Element longitude = new Element( "longitude" );
+            validR = new Attribute( "min", "-180" );
+            longitude.setAttribute( validR );
+            validR = new Attribute( "max", "180" );
+            longitude.setAttribute( validR );
             longitude.setText( obs.getLongitude().toString() );
             observatory.addContent( longitude );
 
             final Element latitude = new Element( "latitude" );
+            validR = new Attribute( "min", "-90" );
+            latitude.setAttribute( validR );
+            validR = new Attribute( "max", "90" );
+            latitude.setAttribute( validR );
             latitude.setText( obs.getLatitude().toString() );
             observatory.addContent( latitude );
 
             final Element altitude = new Element( "altitude" );
+            validR = new Attribute( "min", "0" );
+            altitude.setAttribute( validR );
+            validR = new Attribute( "max", "10000" );
+            altitude.setAttribute( validR );
             altitude.setText( obs.getAltitude().toString() );
             observatory.addContent( altitude );
@@ -231 +244 @@
 
             //
-            final Element ilsfChoice = new Element( "ilsfChoice" );
+            final Element ilsfChoice = new Element( "ilsf_choice" );
             validR = new Attribute( "valid", iRequest.getObservation().getInstrument().getIlsfChoice().getFirstValue() );
             ilsfChoice.setAttribute( validR );
@@ -286 +299 @@
         tapas.addContent( listRequest );
 
-        String commandePath = servicePath+"/"+user.getLastName()+"/"+fTapas.getId();
-        createXMLFile( document, commandePath );
-
-        //appel a qsub
-        //execAppelQSub( commandePath, user, prop );
+        String commandePath = servicePath+"/"+fTapas.getId();
+        createXMLFile( document, commandePath, prop );
+
+
+    }
+
+    @Transactional(readOnly = true)
+    public void createUserFtpDir( @NotNull final User user, @NotNull final Properties prop )
+            throws ServiceException
+    {
+
+        final String usersPath = prop.getProperty( "users_path" );
+        String commande = "mkdir -p "+usersPath+"/"+user.getEmail();
+
+        try
+        {
+            EtherHelper.execProcess( commande );
+        }
+        catch( FormattedException e )
+        {
+
+        }
+
+        EtherHelper.pause(4000);
+
+        commande = "chown -R "+prop.getProperty( "chown_user" )+" "+usersPath+"/"+user.getEmail();
+
+        try
+        {
+            EtherHelper.execProcess( commande );
+        }
+        catch( FormattedException e )
+        {
+
+        }
+
     }
 
@@ -298 +342 @@
     {
         String commande="";
-        String commandePath=prop.getProperty( "service_path" )+"/"+user.getLastName()+"/"+repCommande+"/";
+        String commandePath=prop.getProperty( "service_path" )+"/"+repCommande+"/";
 
         //copie run qsub dans repertoire commande
         commande = "cp "+prop.getProperty( "src_path" )+"/"+prop.getProperty( "process_name" )+" "+commandePath;
 
+        try
+        {
+            EtherHelper.execProcess( commande );
+        }
+        catch( FormattedException e )
+        {
+
+        }
+
+        EtherHelper.pause(5000);
+
+        commande="chown "+prop.getProperty( "chown_user" )+" "+prop.getProperty( "src_path" )+"/"+prop.getProperty( "process_name" );
+        try
+        {
+            EtherHelper.execProcess( commande );
+        }
+        catch( FormattedException e )
+        {
+
+        }
+
+        EtherHelper.pause(5000);
+
+        commande="chmod 755 "+prop.getProperty( "src_path" )+"/"+prop.getProperty( "process_name" );
         try
         {
@@ -393 +461 @@
 
 
-    public void createXMLFile( final Document document, final String commandePath )
+    public void createXMLFile( final Document document, final String commandePath, final Properties prop )
     {
         try
@@ -400 +468 @@
             try
             {
-                EtherHelper.execProcess( "mkdir -p "+commandePath );
+                EtherHelper.execProcess( "mkdir -p "+commandePath+" ; chown "+prop.getProperty( "chown_user" )+" "+commandePath  );
             }
             catch( FormattedException e )
@@ -417 +485 @@
             sortie.output( document, new FileOutputStream( fichier ) );
 
-            //EtherHelper.pause(7000);
+            try
+            {
+                EtherHelper.execProcess( "chmod 755 "+commandePath+"/"+"request.xml" );
+            }
+            catch( FormattedException e )
+            {
+
+            }
+
+            EtherHelper.pause(7000);
 
         }

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

@@ -20 +20 @@
 {
 
-    public void createXMLRequest( @NotNull final Tapas tapas, @NotNull final User user, @NotNull final Properties prop )
+    public void createXMLRequest( @NotNull final Tapas tapas, @NotNull final Properties prop )
             throws ServiceException;
 
-    public void createXMLFile( final Document document, final String commandePath );
+    public void createUserFtpDir( @NotNull final User user, @NotNull final Properties prop )
+            throws ServiceException;
+
+    public void createXMLFile( final Document document, final String commandePath, final Properties prop );
 
     public List<Observatory> getAllObservatories() throws ServiceException;