Changeset 470 for tapas/service

Timestamp:

04/06/12 17:01:41 (12 years ago)

Author:

rboipsl

Message:

debut dev creation experiment file names

Location:

tapas/service

Files:

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

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

@@ -6 +6 @@
 import com.ether.tapas.Request;
 import com.ether.tapas.Tapas;
+import com.ether.user.User;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -18 +19 @@
 import org.springframework.transaction.annotation.Transactional;
 
+
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Array;
 import java.util.List;
+import java.util.Properties;
 
 /**
@@ -30 +37 @@
 {
     @Transactional(readOnly = true)
-    public void createXMLRequest( @NotNull final Tapas fTapas )
+    public void createXMLRequest( @NotNull final Tapas fTapas, @NotNull final User user )
             throws ServiceException
     {
@@ -67 +74 @@
             final Attribute validF = new Attribute( "valid", "ACII,FITS,NETCDF" );
             format.setAttribute( validF );
-            format.setText( iRequest.getPreference().getFormat().getSecondValue());
+            format.setText( iRequest.getPreference().getFormat().getSecondValue() );
             preferences.addContent( format );
 
@@ -75 +82 @@
             Attribute validR = new Attribute( "valid", "YES,NO" );
             rayleighExtinction.setAttribute( validR );
-            rayleighExtinction.setText( iRequest.getPreference().getRayleighExtinction().getSecondValue());
+            rayleighExtinction.setText( iRequest.getPreference().getRayleighExtinction().getSecondValue() );
             preferences.addContent( rayleighExtinction );
 
             //h2o
             final Element h2oe = new Element( "h2o_extinction" );
-            validR = new Attribute( "valid", "YES,NO");
+            validR = new Attribute( "valid", "YES,NO" );
             h2oe.setAttribute( validR );
             h2oe.setText( iRequest.getPreference().getH2oExtinction().getSecondValue() );
@@ -87 +94 @@
             //o2
             final Element o2e = new Element( "o2_extinction" );
-            validR = new Attribute( "valid", "YES,NO");
+            validR = new Attribute( "valid", "YES,NO" );
             o2e.setAttribute( validR );
             o2e.setText( iRequest.getPreference().getO2Extinction().getSecondValue() );
@@ -94 +101 @@
             //o3
             final Element o3e = new Element( "o3_extinction" );
-            validR = new Attribute( "valid", "YES,NO");
+            validR = new Attribute( "valid", "YES,NO" );
             o3e.setAttribute( validR );
-            o3e.setText( iRequest.getPreference().getO3Extinction().getSecondValue());
+            o3e.setText( iRequest.getPreference().getO3Extinction().getSecondValue() );
             preferences.addContent( o3e );
 
             //co2
             final Element co2e = new Element( "co2_extinction" );
-            validR = new Attribute( "valid", "YES,NO");
+            validR = new Attribute( "valid", "YES,NO" );
             co2e.setAttribute( validR );
             co2e.setText( iRequest.getPreference().getCo2Extinction().getSecondValue() );
@@ -116 +123 @@
             // date mesure
             final Element mdate = new Element( "date" );
-            mdate.setText( iRequest.getObservation().getDate());
+            mdate.setText( iRequest.getObservation().getDate() );
 
             observation.addContent( mdate );
@@ -131 +138 @@
             catch( PersistenceException e )
             {
-                throw new ServiceException(ServiceException.ServiceCode.OBSERVATORY_NOT_FOUND,e);
+                throw new ServiceException( ServiceException.ServiceCode.OBSERVATORY_NOT_FOUND, e );
             }
 
 
             final Element name = new Element( "name" );
-            name.setText(obs.getName());
+            name.setText( obs.getName() );
             observatory.addContent( name );
 
@@ -148 +155 @@
 
             final Element altitude = new Element( "altitude" );
-            altitude.setText( obs.getAltitude().toString());
+            altitude.setText( obs.getAltitude().toString() );
             observatory.addContent( altitude );
-
 
 
@@ -161 +167 @@
             los.addContent( ra_j2000 );
 
-            final Element dec_j2000  = new Element( "dec_j2000" );
+            final Element dec_j2000 = new Element( "dec_j2000" );
             dec_j2000.setText( iRequest.getObservation().getLos().getDecJ2000() );
             los.addContent( dec_j2000 );
@@ -173 +179 @@
             zenith_angle.setAttribute( a2 );
 
-            zenith_angle.setText( iRequest.getObservation().getLos().getZenithAngle());
+            zenith_angle.setText( iRequest.getObservation().getLos().getZenithAngle() );
 
             los.addContent( zenith_angle );
@@ -183 +189 @@
 
             final Element spectral_choice = new Element( "spectral_choice" );
-            Attribute a3 = new Attribute( "valid", iRequest.getObservation().getInstrument().getSpectralChoice().getFirstValue());
+
+
+            final String[] tabMess = iRequest.getObservation().getInstrument().getSpectralChoice().getFirstValue().split( "," );
+
+            String chValid = "";
+            int i;
+
+            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 );
+                else chValid += EtherHelper.getMessage( "label.spectralUnit." + tabMess[i], null ) + ",";
+            }
+
+
+            Attribute a3 = new Attribute( "valid", chValid );
+
             spectral_choice.setAttribute( a3 );
-            spectral_choice.setText( iRequest.getObservation().getInstrument().getSpectralChoice().getSecondValue());
+            final String message = EtherHelper.getMessage( "label.spectralUnit." + iRequest.getObservation().getInstrument().getSpectralChoice().getSecondValue(), null );
+            spectral_choice.setText( message );
             instrument.addContent( spectral_choice );
 
-
+            final Element spectral_range = new Element( "spectral_range" );
+            spectral_range.setText( iRequest.getObservation().getInstrument().getSpectralRange() );
+            instrument.addContent( spectral_range );
+
+
+            //
+            final Element ilsfChoice = new Element( "ilsfChoice" );
+            validR = new Attribute( "valid", iRequest.getObservation().getInstrument().getIlsfChoice().getFirstValue() );
+            ilsfChoice.setAttribute( validR );
+            //selectInstrumentalFunctions
+            ilsfChoice.setText( String.valueOf( iRequest.getObservation().getInstrument().getIlsfChoice().getSecondValue() ) );
+            instrument.addContent( ilsfChoice );
+
+
+            final Element resolvingPower = new Element( "resolving_power" );
+            validR = new Attribute( "min", "0" );
+            resolvingPower.setAttribute( validR );
+            resolvingPower.setText( String.valueOf( iRequest.getObservation().getInstrument().getResolvingPower().getSecondValue() ) );
+            instrument.addContent( resolvingPower );
+
+            final Element samplingRatio = new Element( "sampling_ratio" );
+            validR = new Attribute( "min", "0" );
+            samplingRatio.setAttribute( validR );
+            samplingRatio.setText( String.valueOf( iRequest.getObservation().getInstrument().getSamplingRatio().getSecondValue() ) );
+            instrument.addContent( samplingRatio );
 
             request.addContent( observation );
+
+            //atmosphere
+            final Element atmosphere = new Element( "atmosphere" );
+            request.addContent( atmosphere );
+
+            //reference
+            final Element reference = new Element( "reference" );
+            validR = new Attribute( "valid", "0,1,2,3,4,5,6" );
+            reference.setAttribute( validR );
+            reference.setText( String.valueOf( iRequest.getAtmosphere().getReference().getSecondValue() ) );
+            atmosphere.addContent( reference );
+
+            final Properties prop = new Properties();
+            try
+            {
+                prop.load( new FileInputStream( "/home_local/workspace/tapas.properties" ) );
+            }
+            catch( IOException e )
+            {
+                throw new ServiceException( ServiceException.ServiceCode.PROPERTIES_FILE_NOT_FOUND, e );
+            }
+
+            final String rootPath = prop.getProperty( "root_file_path" );
+            final String userPath = "";
+
+
+            String fileArletty = "", fileECMWF = "";
+            fileArletty = rootPath + "/" + user.getLastName() + "/" + createFileName( iRequest.getObservation().getDate(), "arletty" );
+            fileECMWF = rootPath + "/" + user.getLastName() + "/" + createFileName( iRequest.getObservation().getDate(), "ecmwf" );
+
+
+            final Element arlettyFile = new Element( "arletty_file" );
+            arlettyFile.setText( fileArletty );
+            atmosphere.addContent( arlettyFile );
+
+            final Element ecmwfFile = new Element( "ecmwf_file" );
+            ecmwfFile.setText( fileECMWF );
+            atmosphere.addContent( ecmwfFile );
+
 
             //creer le nom des fichiers input ECMW F + ARLETTY Ã  partir du nom court de l'observatoire
@@ -203 +290 @@
         createXMLFile( fichier, document );
     }
+
+
+ /*   public String findMeasureHour( String date )
+    {
+        String heure;
+        int val;
+
+
+        val = Math.abs( Integer.parseInt( heure ) );
+
+        return heure;
+    }                    */
+
+    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 ) );
+
+
+        if( iheure < 3) ind = "00";
+        else if ( iheure >= 21) {
+            ind = "00";
+        }
+        else if( Math.abs(6-iheure) < 3) ind = "06";
+        else if( Math.abs(12 - iheure) < 3) ind = "12";
+        else if( Math.abs(18 - iheure) < 3 ) ind = "18";
+
+
+        if( type == "arletty" ) fileName = "arletty_" + date + ".txt";
+        else if( type == "ecmwf" ) fileName = "ecmwf_" + date + ".txt";
+        */
+
+
+        return fileName;
+    }
+
 
     public void createXMLFile( final String fichier, final Document document )

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

@@ -24 +24 @@
         OBSERVATORY_NOT_FOUND,
         USER_NOT_FOUND,
+        PROPERTIES_FILE_NOT_FOUND;
     }
 }

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

@@ -3 +3 @@
 import com.ether.tapas.Observatory;
 import com.ether.tapas.Tapas;
+import com.ether.user.User;
 import org.jdom.Document;
 import org.jetbrains.annotations.NotNull;
@@ -17 +18 @@
 {
 
-    public void createXMLRequest( @NotNull final Tapas tapas )
+    public void createXMLRequest( @NotNull final Tapas tapas, @NotNull final User user )
             throws ServiceException;
 
@@ -28 +29 @@
     public Long getNumRequest() throws ServiceException;
 
+    public String createFileName(String date, String type) throws ServiceException;
+
 }