Changeset 171

Timestamp:

04/12/11 11:48:48 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv

Files:

• Makefile.wk (modified) (2 diffs)
• extra/reference_xml.pdf (added)
• extra/xml_reference.odt (added)
• extra/xmlioserver.odg (modified) (previous)
• src/xmlio/array_impl.hpp (modified) (1 diff)
• src/xmlio/attribute_map.cpp (modified) (6 diffs)
• src/xmlio/attribute_map.hpp (modified) (1 diff)
• src/xmlio/attribute_template.cpp (modified) (1 diff)
• src/xmlio/exception.hpp (modified) (1 diff)
• src/xmlio/main_server.cpp (modified) (1 diff)
• src/xmlio/xml_node.cpp (modified) (5 diffs)

XMLIO_V2/dev/dev_rv/Makefile.wk

@@ -16 +16 @@
 GUI       = no
 NPROC     = 1
-CSUITE    = gnu
+CSUITE    = intel
 PFORME    = fedora-wk
 FORTEXT   = .f90
@@ -276 +276 @@
 ifeq ($(CSUITE), intel)
         FFLAGS  += -module $(LIB_PATH)
-        CFLAGS  += -ansi  -diag-disable 1125
+        CFLAGS  += -ansi  -diag-disable 1125 -diag-disable 279
 endif
 

XMLIO_V2/dev/dev_rv/src/xmlio/array_impl.hpp

@@ -77 +77 @@
          shape.push_back(temp);
       }
-      this->reshape(shape);
+      this->resize(shape);
       is.read (reinterpret_cast<char*>(&nelem), sizeof(LSize));
       is.read (reinterpret_cast<char*>(this->data()), nelem * sizeof(ValueType));

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

@@ -14 +14 @@
       CAttributeMap::~CAttributeMap(void)
       { /* Ne rien faire de plus */ }
-
+      
+      ///--------------------------------------------------------------
+      
       bool CAttributeMap::hasAttribute(const StdString & key) const
-      { return (this->find(key) != this->end()); }
-
+      { 
+         return (this->find(key) != this->end()); 
+      }
+      
+      //---------------------------------------------------------------
+      
       void CAttributeMap::setAttribute(const StdString & key, CAttribute * const attr)
       {
@@ -28 +34 @@
          this->find(key)->second->setAnyValue(attr->getAnyValue());
       }
-
+      
+      //---------------------------------------------------------------
+      
       CAttribute * CAttributeMap::operator[](const StdString & key)
       {
@@ -36 +44 @@
          return (SuperClassMap::operator[](key));
       }
-
+      
+      //---------------------------------------------------------------
+      
       StdString CAttributeMap::toString(void) const
       {
@@ -51 +61 @@
          return (oss.str());
       }
-
+      
+      //---------------------------------------------------------------
+      
       void CAttributeMap::fromString(const StdString & str)
-      { ERROR("CAttributeMap::fromString(const StdString & str)",
-             << "[ str = " << str << "] Not implemented yet !"); }
+      { 
+         ERROR("CAttributeMap::fromString(const StdString & str)",
+               << "[ str = " << str << "] Not implemented yet !"); 
+      }
+      
+      //---------------------------------------------------------------
 
       //StdOStream & operator << (StdOStream & os, const CAttributeMap & attributmap)
       //{ os << attributmap.toString(); return (os); }
-
+      
+      //---------------------------------------------------------------
+      
       void CAttributeMap::setAttributes(const xml::THashAttributes & attributes)
       {
@@ -71 +89 @@
             }
       }
-
+      
+      //---------------------------------------------------------------
+      
       void CAttributeMap::setAttributes(const CAttributeMap * const _parent)
       {
@@ -90 +110 @@
          }
       }
+      
+      //---------------------------------------------------------------
+      
+      void CAttributeMap::toBinary(StdOStream & os) const
+      {
+         typedef std::pair<StdString, CAttribute*> StdStrAttPair;
+         SuperClassMap::const_iterator it = this->begin(), end = this->end();
+         
+         const StdSize nbatt = SuperClassMap::size();
+         os.write (reinterpret_cast<const char*>(&nbatt) , sizeof(StdSize));
+         
+         for (; it != end; it++)
+         {
+            const StdString & key   = it->first;
+            const CAttribute* value = it->second;            
+            const StdSize size = key.size();
+            
+            os.write (reinterpret_cast<const char*>(&size) , sizeof(StdSize));
+            os.write (key.data(), size * sizeof(char));
+            
+            if (!value->isEmpty())
+            {
+               bool b = true;
+               os.write (reinterpret_cast<const char*>(&b) , sizeof(bool));
+               value->toBinary(os);
+            }
+            else 
+            {
+               bool b = false;
+               os.write (reinterpret_cast<const char*>(&b) , sizeof(bool));
+            }
+         }
+      }
+      
+      //---------------------------------------------------------------
+      
+      void CAttributeMap::fromBinary(StdIStream & is)
+      {
+         StdSize nbatt = 0;
+         is.read (reinterpret_cast<char*>(&nbatt), sizeof(StdSize));
+         
+         for (StdSize i = 0; i < nbatt; i++)
+         {
+            bool hasValue = false;
+            StdSize size  = 0;
+            is.read (reinterpret_cast<char*>(&size), sizeof(StdSize));
+            StdString key(size, ' ');
+            is.read (const_cast<char *>(key.data()), size * sizeof(char));
+            
+            if (!this->hasAttribute(key))
+               ERROR("CAttributeMap::fromBinary(StdIStream & is)",
+                     << "[ key = " << key << "] key not found !"); 
+                     
+            is.read (reinterpret_cast<char*>(&hasValue), sizeof(bool));
+            
+            if (hasValue)          
+               this->operator[](key)->fromBinary(is);
+         }
+      }
+      
+      ///--------------------------------------------------------------
 
    } // namespace tree

XMLIO_V2/dev/dev_rv/src/xmlio/attribute_map.hpp

@@ -43 +43 @@
             virtual StdString toString(void) const;
             virtual void fromString(const StdString & str);
+            
+            virtual void toBinary  (StdOStream & os) const;
+            virtual void fromBinary(StdIStream & is);
 
          protected :

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

@@ -10 +10 @@
 
       /** Spécialisations des templates pour la fonction [toString] **/
+      
       template <>
          StdString CAttributeTemplate<bool>::toString(void) const

XMLIO_V2/dev/dev_rv/src/xmlio/exception.hpp

@@ -47 +47 @@
 
 #ifdef XIOS_DEBUG
-   #define DEBUG(x) std::clog << "> Debug " << INFO(x)
+#  define DEBUG(x) std::clog << "> Debug " << INFO(x)
 #else
-   #define DEBUG(x)
+#  define DEBUG(x)
 #endif
 

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

@@ -80 +80 @@
       CTreeManager::PrintTreeToFile("data/def/test.xml");
       
+      
+      ARRAY_CREATE(sarray, double, 1, [1]);
+      StdIFStream ifs("data/monfichierbinaire");
+      sarray->fromBinary(ifs);
+      ifs.close();
+      
      
      

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

@@ -17 +17 @@
 
       StdString CXMLNode::getElementName(void) const
-      { return (this->node->name()); }
+      { 
+         return (this->node->name()); 
+      }
 
       bool CXMLNode::goToNextElement(void)
@@ -24 +26 @@
          for(rapidxml::xml_node<char> * nextElement = this->node->next_sibling();
                                       ; nextElement = this->node->next_sibling())
+         {
             if (nextElement == NULL) break;
             else if (nextElement->type() == rapidxml::node_element)
-            { node = nextElement; return (!retvalue); }
+            { 
+               node = nextElement;
+               return (!retvalue);
+            }
+         }
          return (retvalue);
       }
@@ -37 +44 @@
          {
             for(;;nextElement = this->node->next_sibling())
+            {
                if (nextElement == NULL) break;
                else if (nextElement->type() == rapidxml::node_element)
-               { node = nextElement; return (!retvalue); }
+               { 
+                  node = nextElement; 
+                  return (!retvalue); 
+               }
+            }
          }
          return (retvalue);
@@ -54 +66 @@
 
       const StdString & CXMLNode::GetRootName(void)
-      { return (CXMLNode::RootName); }
+      { 
+         return (CXMLNode::RootName); 
+      }
 
       THashAttributes CXMLNode::getAttributes(void) const
@@ -62 +76 @@
 
          if ((currentAttr = this->node->first_attribute()) != NULL)
-            do {
+         {
+            do 
+            {
                attributes.insert(std::pair<StdString, StdString>
                                 (StdString(currentAttr->name()),
                                  StdString(currentAttr->value())));
             } while ((currentAttr = currentAttr->next_attribute()) != NULL);
+         }
 
          return (attributes) ;