Changeset 174

Timestamp:

04/13/11 17:02:25 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv

Files:

• Makefile.wk (modified) (1 diff)
• extra/xmlioserver.odg (modified) (previous)
• src/xmlio/main_server.cpp (modified) (1 diff)
• src/xmlio/node/file.cpp (modified) (1 diff)
• src/xmlio/node/file.hpp (modified) (1 diff)

XMLIO_V2/dev/dev_rv/Makefile.wk

@@ -435 +435 @@
 clean-dat:
         $(REMOVE) $(DATA_PATH)/*.dat
+#$(REMOVE) $(DATA_PATH)/*.bin
         $(REMOVE) $(DATA_PATH)/*.nc
         $(REMOVE) $(DATA_PATH)/def/*

XMLIO_V2/dev/dev_rv/src/xmlio/main_server.cpp

@@ -14 +14 @@
       comm::CMPIManager::Initialise(&argc, &argv); // < seulement en mode connecté
 
-      //CTreeManager::ParseFile  ("test/iodef_simple_test.xml");
+      /*CTreeManager::ParseFile  ("test/iodef_simple_test.xml");
             
-      /*StdOFStream ofs("data/data.bin");
+      StdOFStream ofs("data/data.bin");
       CTreeManager::ToBinary(ofs);
       ofs.close();*/

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

@@ -174 +174 @@
          this->enabledFields[i]->solveOperation();
    }
+   
+   //---------------------------------------------------------------
+   
+   void CFile::toBinary  (StdOStream & os) const
+   {
+      ENodeType genum = CFileGroup::GetType();
+      bool hasVFG = (this->getVirtualFieldGroup().get() != NULL);
+      SuperClass::toBinary(os);
+      
+      os.write (reinterpret_cast<const char*>(&genum) , sizeof(ENodeType));
+      os.write (reinterpret_cast<const char*>(&hasVFG) , sizeof(bool));
+      
+      if (hasVFG)this->getVirtualFieldGroup()->toBinary(os);
+         
+   }
+   
+   void CFile::fromBinary(StdIStream & is)
+   {
+      ENodeType renum = Unknown;
+      bool hasVFG = false;
+      SuperClass::fromBinary(is);
+      
+      is.read (reinterpret_cast<char*>(&renum), sizeof(ENodeType));
+      is.read (reinterpret_cast<char*>(&hasVFG), sizeof(bool));
+      
+      if (renum != CFileGroup::GetType())
+         ERROR("CFile::fromBinary(StdIStream & is)",
+               << "[ renum = " << renum << "] Bad type !");
+      
+      this->setVirtualFieldGroup(this->getId());
+      if (hasVFG)this->getVirtualFieldGroup()->fromBinary(is);
+      
+   }
 
    ///---------------------------------------------------------------

XMLIO_V2/dev/dev_rv/src/xmlio/node/file.hpp

@@ -73 +73 @@
          virtual void parse(xml::CXMLNode & node);
          virtual StdString toString(void) const;
+         
+         virtual void toBinary  (StdOStream & os) const;
+         virtual void fromBinary(StdIStream & is);
 
          /// Accesseurs statiques ///