Changeset 286 for XMLIO_V2/dev/common/src/xmlio/object_factory_impl.hpp

Timestamp:

10/21/11 19:01:35 (13 years ago)

Author:

ymipsl

Message:

reprise en main de la version de H. Ozdoba. Correction de différentes erreurs de conception et bug.
Version NEMO operationnel en client/server, interoperabilita avec OASIS, reconstition de fichiers via netcdf4/HDF5

YM

File:

• XMLIO_V2/dev/common/src/xmlio/object_factory_impl.hpp (modified) (4 diffs)

XMLIO_V2/dev/common/src/xmlio/object_factory_impl.hpp

@@ -31 +31 @@
       return (U::AllMapObj[CObjectFactory::CurrContext].find(id) !=
               U::AllMapObj[CObjectFactory::CurrContext].end());
+   }
+
+   template <typename U>
+      bool CObjectFactory::HasObject(const StdString & context, const StdString & id)
+   {
+      if (U::AllMapObj.find(context) == U::AllMapObj.end()) return false ;
+      else return (U::AllMapObj[context].find(id) !=  U::AllMapObj[context].end());
    }
 
@@ -73 +80 @@
 
    template <typename U>
+      boost::shared_ptr<U> CObjectFactory::GetObject(const StdString & context, const StdString & id)
+   {
+      if (!CObjectFactory::HasObject<U>(context,id))
+         ERROR("CObjectFactory::GetObject(const StdString & id)",
+               << "[ id = " << id << ", U = " << U::GetName() <<", context = "<<context<< " ] "
+               << " object is not referenced !");
+      return (U::AllMapObj[CObjectFactory::CurrContext][id]);
+   }
+
+   template <typename U>
       boost::shared_ptr<U> CObjectFactory::CreateObject(const StdString & id)
    {
@@ -80 +97 @@
       if (id.size() == 0)
       {
-         boost::shared_ptr<U> value(new U);
+         boost::shared_ptr<U> value(new U(CObjectFactory::GenUId<U>()));
          U::AllVectObj[CObjectFactory::CurrContext].insert
             (U::AllVectObj[CObjectFactory::CurrContext].end(), value);
+         U::AllMapObj[CObjectFactory::CurrContext].insert(std::make_pair(value->getId(), value));
          return (value);
       }
@@ -105 +123 @@
       return (U::AllVectObj[context]);
    }
-
+   
+   template <typename U> 
+       StdString CObjectFactory::GenUId(void)
+       {
+          long int seed ;
+          
+          xios_map<StdString,long int>::iterator it ;
+          it=U::GenId.find(CObjectFactory::CurrContext);
+          if (it==U::GenId.end())
+          {
+            seed=0 ;
+            U::GenId[CObjectFactory::CurrContext]=seed ;
+          }
+          else
+          {
+            seed=it->second ;
+            seed++ ;
+            it->second=seed ;
+          }
+          
+          StdOStringStream oss ;
+          oss<<"__"<<U::GetName()<<"_undef_id_"<<seed ;
+          return StdString(oss.str()) ;
+        }
+          
 } // namespace xmlioserver