Changeset 466 for tapas/service

Timestamp:

04/04/12 17:17:40 (12 years ago)

Author:

rboipsl

Message:

creation form xml

Location:

tapas/service

Files:

• implementation/com/ether/TapasServiceImpl.java (modified) (4 diffs)
• implementation/service-context.xml (modified) (1 diff)
• interface/com/ether/TapasService.java (modified) (1 diff)

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

@@ -39 +39 @@
         final Element request = new Element( "request" );
 
-
         //On crée un nouveau Document JDOM basé sur la racine que l'on vient de créer
         final Document document = new Document( tapas );
 
         //a terme recuperer id tapas via la BDD
-        Long newNum = getNumRequest();
+        //Long newNum = getNumRequest();
+        fTapas.setId( "1414" );
 
         final Attribute id = new Attribute( "Id", fTapas.getId() );
@@ -58 +58 @@
             request.setAttribute( idR );
 
-            //final Observatory obs = getObservatoryByName( iRequest.getObservation().getObservatory().getName() );
 
             // PREFERENCES
             final Element preferences = new Element( "preferences" );
 
-            // Element format
+            //format
             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" );
             format.setAttribute( validF );
-            format.setText( iRequest.getPreference().getFormat().getSecondValue() );
-
+            format.setText( iRequest.getPreference().getFormat().getSecondValue());
             preferences.addContent( format );
 
-            // Element rayleighExtinction
-            /* final Element rayleighExtinction = new Element( "rayleigh_extinction" );
-          final Attribute validR = new Attribute( "valid", iRequest.getPreference().getRayleighExtinction().getFirstValue() );
-          rayleighExtinction.setAttribute( validR );
-          rayleighExtinction.setText( iRequest.getPreference().getRayleighExtinction().getSecondValue() );
-          preferences.addContent( rayleighExtinction );*/
-
+            //rayleighExtinction
+            final Element rayleighExtinction = new Element( "rayleigh_extinction" );
+            //final Attribute validR = new Attribute( "valid", iRequest.getPreference().getRayleighExtinction().getFirstValue() );
+            Attribute validR = new Attribute( "valid", "YES,NO" );
+            rayleighExtinction.setAttribute( validR );
+            rayleighExtinction.setText( iRequest.getPreference().getRayleighExtinction().getSecondValue());
+            preferences.addContent( rayleighExtinction );
+
+            //h2o
+            final Element h2oe = new Element( "h2o_extinction" );
+            validR = new Attribute( "valid", "YES,NO");
+            h2oe.setAttribute( validR );
+            h2oe.setText( iRequest.getPreference().getH2oExtinction().getSecondValue() );
+            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
+            final Element o3e = new Element( "o3_extinction" );
+            validR = new Attribute( "valid", "YES,NO");
+            o3e.setAttribute( validR );
+            o3e.setText( iRequest.getPreference().getO3Extinction().getSecondValue());
+            preferences.addContent( o3e );
+
+            //co2
+            final Element co2e = new Element( "co2_extinction" );
+            validR = new Attribute( "valid", "YES,NO");
+            co2e.setAttribute( validR );
+            co2e.setText( iRequest.getPreference().getCo2Extinction().getSecondValue() );
+            preferences.addContent( co2e );
 
             request.addContent( preferences );
@@ -85 +111 @@
             //recuperer les coordonnees obervatoire avec requete sql : methode de tapas services -> appel methode couche persistence
             // TapasService
-
-
-            //creer le nome des fichiers input ECMW F + ARLETTY Ã  partir du nom court de l'observatoire
+            //iRequest.getObservation().getDate()
+            final Element observation = new Element( "observation" );
+
+            // date mesure
+            final Element mdate = new Element( "date" );
+            mdate.setText( iRequest.getObservation().getDate());
+
+            observation.addContent( mdate );
+
+            //observatoire
+            final Element observatory = new Element( "observatory" );
+            observation.addContent( observatory );
+
+            final Observatory obs;
+            try
+            {
+                obs = _observatoryDAO.selectByPrimaryKey( iRequest.getObservation().getObservatory().getId() );
+            }
+            catch( PersistenceException e )
+            {
+                throw new ServiceException(ServiceException.ServiceCode.OBSERVATORY_NOT_FOUND,e);
+            }
+
+
+            final Element name = new Element( "name" );
+            name.setText(obs.getName());
+            observatory.addContent( name );
+
+            final Element longitude = new Element( "longitude" );
+            longitude.setText( obs.getLongitude().toString() );
+            observatory.addContent( longitude );
+
+            final Element latitude = new Element( "latitude" );
+            latitude.setText( obs.getLatitude().toString() );
+            observatory.addContent( latitude );
+
+            final Element altitude = new Element( "altitude" );
+            altitude.setText( obs.getAltitude().toString());
+            observatory.addContent( altitude );
+
+
+
+            //los
+            final Element los = new Element( "los" );
+            observation.addContent( los );
+
+            final Element ra_j2000 = new Element( "ra_j2000" );
+            ra_j2000.setText( iRequest.getObservation().getLos().getRaJ2000() );
+            los.addContent( ra_j2000 );
+
+            final Element dec_j2000  = new Element( "dec_j2000" );
+            dec_j2000.setText( iRequest.getObservation().getLos().getDecJ2000() );
+            los.addContent( dec_j2000 );
+
+            final Element zenith_angle = new Element( "zenith_angle" );
+
+            Attribute a1 = new Attribute( "min", "0" );
+            Attribute a2 = new Attribute( "max", "90" );
+
+            zenith_angle.setAttribute( a1 );
+            zenith_angle.setAttribute( a2 );
+
+            zenith_angle.setText( iRequest.getObservation().getLos().getZenithAngle());
+
+            los.addContent( zenith_angle );
+
+
+            //instrument
+            final Element instrument = new Element( "instrument" );
+            observation.addContent( instrument );
+
+            final Element spectral_choice = new Element( "spectral_choice" );
+            Attribute a3 = new Attribute( "valid", iRequest.getObservation().getInstrument().getSpectralChoice().getFirstValue());
+            spectral_choice.setAttribute( a3 );
+            spectral_choice.setText( iRequest.getObservation().getInstrument().getSpectralChoice().getSecondValue());
+            instrument.addContent( spectral_choice );
+
+
+
+            request.addContent( observation );
+
+            //creer le nom des fichiers input ECMW F + ARLETTY Ã  partir du nom court de l'observatoire
             // + calculer le bonne heure de mesure en fonction de la date demandée : 00 06 12 ou 18h
             //TapasService
 
-
             //créer le num de le requete en lisant dans bdd
-
 
             tapas.addContent( request );
@@ -152 +255 @@
     @Nullable
     @Transactional(readOnly = true)
-    public Observatory getObservatoryByName( @NotNull final String name )
-            throws ServiceException
-    {
-        try
-        {
-            return _observatoryDAO.getObservatoryByName( name );
+    public Observatory getObservatoryById( @NotNull final long id )
+            throws ServiceException
+    {
+        try
+        {
+            return _observatoryDAO.getObservatoryById( id );
         }
         catch( PersistenceException e )

tapas/service/implementation/service-context.xml

@@ -5 +5 @@
     <bean id="tapasServiceTarget" class="com.ether.TapasServiceImpl" parent="backofficeServiceTarget">
         <property name="observatoryDAO" ref="refObservatoryDAO"/>
-        <property name="tapasNumRequestDAO" ref="refTapasNumRequestDAO"/>
     </bean>
 

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

@@ -24 +24 @@
     public List<Observatory> getAllObservatories() throws ServiceException;
 
-    public Observatory getObservatoryByName(@NotNull final String name) throws ServiceException;
+    public Observatory getObservatoryById(@NotNull final long id) throws ServiceException;
 
     public Long getNumRequest() throws ServiceException;