Changeset 779 for tapas/service

Timestamp:

04/01/14 16:56:38 (10 years ago)

Author:

rboipsl

Message:

Dernière version rboipsl

Location:

tapas/service

Files:

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

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

@@ -44 +44 @@
     public void createXMLRequest( @NotNull final Tapas fTapas, @NotNull final Properties prop )
             throws ServiceException
-    {
+   {
 
         final String servicePath = prop.getProperty( "service_path" );
@@ -125 +125 @@
             preferences.addContent( co2e );
 
-            //berv correction
-            final Element bervCorr = new Element( "berv_correction" );
+            //ch4
+            final Element ch4e = new Element( "ch4_extinction" );
             validR = new Attribute( "valid", "YES,NO" );
-            bervCorr.setAttribute( validR );
-            bervCorr.setText( iRequest.getPreference().getBervCorrection().getSecondValue() );
-            preferences.addContent( bervCorr );
+            ch4e.setAttribute( validR );
+            ch4e.setText( iRequest.getPreference().getCh4Extinction().getSecondValue() );
+            preferences.addContent( ch4e );
+
+            //no2
+            final Element n2oe = new Element( "n2o_extinction" );
+            validR = new Attribute( "valid", "YES,NO" );
+            n2oe.setAttribute( validR );
+            n2oe.setText( iRequest.getPreference().getN2oExtinction().getSecondValue() );
+            preferences.addContent( n2oe );
 
 
@@ -158 +165 @@
             try
             {
-                obs = _observatoryDAO.selectByPrimaryKey( iRequest.getObservation().getObservatory().getId() );
+                //obs = _observatoryDAO.selectByPrimaryKey( iRequest.getObservation().getObservatory().getId() );
+                obs = _observatoryDAO.getObservatoryByName( iRequest.getObservation().getObservatory().getName() );
             }
             catch( PersistenceException e )
@@ -280 +288 @@
             instrument.addContent( samplingRatio );
 
+            //berv correction
+            //final Element bervCorr = new Element( "berv_correction" );
+            final Element bervCorr = new Element( "appli_berv" );
+            validR = new Attribute( "valid", "YES,NO" );
+            bervCorr.setAttribute( validR );
+            bervCorr.setText( iRequest.getPreference().getBervCorrection().getSecondValue() );
+            instrument.addContent( bervCorr );
+
+
             request.addContent( observation );
 
@@ -629 +646 @@
 
 
+    // recuperation infos observatoire avec le nom
+    @Nullable
+    @Transactional(readOnly = true)
+    public Observatory getObservatoryByName( @NotNull final String name )
+            throws ServiceException
+    {
+        try
+        {
+            return _observatoryDAO.getObservatoryByName( name );
+        }
+        catch( PersistenceException e )
+        {
+            throw new ServiceException( ServiceException.ServiceCode.OBSERVATORY_NOT_FOUND, e );
+        }
+    }
+
+
     @Required
     public void setObservatoryDAO( final ObservatoryDAO observatoryDAO )

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

@@ -32 +32 @@
     public Observatory getObservatoryById(@NotNull final long id) throws ServiceException;
 
+    public Observatory getObservatoryByName(@NotNull final String name) throws ServiceException;
+
     public Long getNumRequest() throws ServiceException;