Changeset 105 for XMLIO_V2/dev/dev_rv

Timestamp:

06/08/10 15:43:19 (14 years ago)

Author:

hozdoba

Message:

Commit intermédiaire.
Ajout d'un systÚme d'indentation trÚs simplifié pour les flux de sortie.
Un problÚme corrigé - seg. fault en cas d'absence de field_definition dans un context donnée.

Location:

XMLIO_V2/dev/dev_rv/src/XMLIO

Files:

• context.hpp (modified) (3 diffs)
• field.hpp (modified) (1 diff)
• field_group.hpp (modified) (2 diffs)
• main_cpp.cpp (modified) (2 diffs)
• xmlio_logger.hpp (modified) (1 diff)
• xmlio_xml_parser.hpp (modified) (1 diff)

XMLIO_V2/dev/dev_rv/src/XMLIO/context.hpp

@@ -24 +24 @@
          friend ostream& operator<< (ostream& out, const Context& c) 
          { 
-            out << "<" << c.getName()<< " id=\"" <<  c.getId() << "\">";
-            if(c.fieldDef != NULL) out << std::endl << *(FieldGroup*)c.fieldDef << std::endl;
-            out << "</" << c.getName()<< ">";
+            out << IncIndent << "<" << c.getName()<< " id=\"" <<  c.getId() << "\">" << std::endl;
+            if(c.fieldDef != NULL) out << *(FieldGroup*)c.fieldDef << std::endl;
+            out << NIndent << "</" << c.getName()<< ">" << DecEndl;
             return (out);
          } 
@@ -33 +33 @@
          {
             // Résolution des héritages descendants pour chacun des groupes de définitions.
-            fieldDef->resolveDescInheritance();
+            if(fieldDef != NULL) fieldDef->resolveDescInheritance();
          }
          
@@ -99 +99 @@
                   
          ~Context()
-         { delete fieldDef; }      
+         { if(fieldDef != NULL) delete fieldDef; }      
 
       

XMLIO_V2/dev/dev_rv/src/XMLIO/field.hpp

@@ -18 +18 @@
          friend ostream& operator<< (ostream& out, const Field& c) 
          {
-            out << "<" << c.getName();
+            out << IncIndent << "<" << c.getName();
             if(c.hasId()) out << " id=\"" <<  c.getId() << "\"";
             for(unsigned int i = 0; i < c.attrList.getVectorSize(); i++) out << *c.attrList.getVector()[i];
-            out << "/>";
+            out << "/>" << DecEndl;
                            
             return (out);

XMLIO_V2/dev/dev_rv/src/XMLIO/field_group.hpp

@@ -26 +26 @@
          }
                  
-         const char* getName(void) const {return ("FieldGroup"); }  
+         const char* getName(void) const {return ("Field_Group"); }  
          
          friend ostream& operator<< (ostream& out, const FieldGroup& c) 
          {            
-            out << "<" << c.getName();
+            out << IncIndent << "<" << c.getName();
             if(c.hasId()) out << " id=\"" <<  c.getId() << "\"";
             for(unsigned int i = 0; i < c.attrList.getVectorSize(); i++) out << *c.attrList.getVector()[i];
             out << ">" << std::endl;
+            
             
             for(unsigned int i = 0; i < c.groupList.getVector().size() ; i++)
@@ -41 +42 @@
                out << *(c.childList.getVector()[i]) << std::endl;
                
-            out << "</" << c.getName()<< ">";
+            out << NIndent << "</" << c.getName()<< ">" << DecEndl;
             return (out);
          } 

XMLIO_V2/dev/dev_rv/src/XMLIO/main_cpp.cpp

@@ -11 +11 @@
         try
         {
-      string file("/local/testsuite/iodef_test.xml");
+      string file("/local/svn/dev_rv/test/iodef_test.xml");
       ifstream istr( file.c_str() , ifstream::in );
       
@@ -31 +31 @@
 
         }
-        catch(const XMLIOException &exc)
+        catch(const Exception &exc)
         {  // Pour tout type d'exceptions, on note les informations sur la sortie paramétrée.
                 ERROR(exc.displayText()); 

XMLIO_V2/dev/dev_rv/src/XMLIO/xmlio_logger.hpp

@@ -51 +51 @@
    // Initialisation de la classe de Logging
    static ILogger LOGGER("xmlio.log");
+   
+static unsigned int Indent;
+
+std::ostream& NIndent(std::ostream& out)
+{ for(unsigned int i = 0; i < Indent; i++) out << "  "; return(out); }
+
+std::ostream& IncIndent(std::ostream& out)
+{ Indent++; return (NIndent(out)); }
+
+std::ostream& DecEndl(std::ostream& out)
+{ Indent--; return (NIndent(out)); }
 
 /************* POUR MEMOIRE **********************

XMLIO_V2/dev/dev_rv/src/XMLIO/xmlio_xml_parser.hpp

@@ -60 +60 @@
             static void ShowTree(ostream& os = std::clog)
             {
-               clog <<  "<?xml version=\"1.0\"?>" << std::endl << "<Simulation>" << std::endl;
+               clog <<  "<?xml version=\"1.0\"?>" << std::endl;
+               clog <<  "<Simulation>" << std::endl;
                HashMap<string, StrHashMap<Context> > &AllListContext = Context::GetAllListObject();