Changeset 187 for XMLIO_V2/dev/dev_rv/src/xmlio/node/field.cpp

Timestamp:

05/03/11 11:55:06 (13 years ago)

Author:

hozdoba

Message:

 

File:

• XMLIO_V2/dev/dev_rv/src/xmlio/node/field.cpp (modified) (5 diffs)

XMLIO_V2/dev/dev_rv/src/xmlio/node/field.cpp

@@ -7 +7 @@
 #include "node_type.hpp"
 
+#include "xios_manager.hpp"
+
 namespace xmlioserver{
 namespace tree {
@@ -14 +16 @@
    CField::CField(void)
       : CObjectTemplate<CField>(), CFieldAttributes()
-      , baseRefObject(), refObject(), grid(), file(), foperation(NULL)
+      , refObject(), baseRefObject()
+      , grid(), file()
+      , freq_operation(), freq_write()
+      , foperation()
+      , data()
    { /* Ne rien faire de plus */ }
 
    CField::CField(const StdString & id)
       : CObjectTemplate<CField>(id), CFieldAttributes()
-      , baseRefObject(), refObject(), foperation(NULL)
+      , refObject(), baseRefObject()
+      , grid(), file()
+      , freq_operation(), freq_write()
+      , foperation()
+      , data()
    { /* Ne rien faire de plus */ }
 
@@ -26 +36 @@
       this->grid.reset() ;
       this->file.reset() ;
-      if (this->foperation == NULL)
-         delete this->foperation;
+      this->foperation.reset() ;
+      this->data.reset() ;
    }
 
@@ -107 +117 @@
       boost::shared_ptr<CField> refer_sptr;
       CField * refer_ptr = this;
+      
       this->baseRefObject = CObjectFactory::GetObject<CField>(this);
+      
       while (refer_ptr->hasDirectFieldReference())
       {
@@ -131 +143 @@
    void  CField::solveOperation(void)
    {
-      // TODO : à compléter;
+      using namespace func;
+      using namespace date;
+       
+      StdString id = this->getBaseFieldReference()->getId();      
+      if (operation.isEmpty() || freq_op.isEmpty() || this->file->output_freq.isEmpty())
+      {
+         ERROR("CField::solveOperation(void)",
+               << "[ id = " << id << "]"
+               << "Impossible de définir une opération pour le champ !");
+      }
+
+      if (CXIOSManager::GetStatus() == CXIOSManager::LOC_SERVER)
+      {
+         this->freq_operation = CDuration::FromString(this->file->output_freq.getValue());
+         this->freq_write     = CDuration::FromString(this->file->output_freq.getValue());
+         //this->foperation = boost::shared_ptr<func::CFunctor>(new CInstant());
+      }
+      else
+      {
+         this->freq_operation = CDuration::FromString(freq_op.getValue());
+         this->freq_write     = CDuration::FromString(this->file->output_freq.getValue());
+         
+#define DECLARE_FUNCTOR(MType, mtype) \
+   if  (operation.getValue().compare(#mtype) == 0){}
+      //this->foperation = boost::shared_ptr<func::CFunctor>(new C##MType());
+   
+#include "functor_type.conf"
+      }
    }