Changeset 10928 for OpenSceneGraph/trunk/src/osgDB/XmlParser.cpp

Timestamp:

01/07/10 18:36:44 (3 years ago)

Author:

robert

Message:

From Jean-Sebastien Guay, fixed handling of < tag /> xml syntax

Files:

• OpenSceneGraph/trunk/src/osgDB/XmlParser.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/src/osgDB/XmlParser.cpp

@@ -227 +227 @@
 
             int c = 0;
-            while ((c=input[0])>=0 && c!=' ' && c!='>' )
+            while ((c=input[0])>=0 && c!=' ' && c!='>' && c!='/')
             {
                 childNode->name.push_back(c);
@@ -233 +233 @@
             }
 
-            while ((c=input[0])>=0 && c!='>')
+            while ((c=input[0])>=0 && c!='>' && c!='/')
             {
                 Input::size_type prev_pos = input.currentPosition();
@@ -240 +240 @@
                 std::string option;
                 std::string value;
-                while((c=input[0])>=0 && c!='>' && c!='"' && c!='\'' && c!='=' && c!=' ')
+                while((c=input[0])>=0 && c!='>' && c!='/' && c!='"' && c!='\'' && c!='=' && c!=' ')
                 {
                     option.push_back(c);
@@ -296 +296 @@
             }
 
-            if ((c=input[0])>=0 && c=='>' )
+            if ((c=input[0])>=0 && c=='>' || c=='/')
             {
                 ++input;
@@ -302 +302 @@
                 osg::notify(osg::INFO)<<"Valid tag ["<<childNode->name<<"]"<<std::endl;
 
-                bool result = childNode->read(input);
-                if (!result) return false;
+                if (c=='/')
+                {
+                    if ((c=input[0])>=0 && c=='>')
+                    {
+                        ++input;
+                        osg::notify(osg::INFO)<<"tag is closed correctly"<<std::endl;
+                    }
+                    else 
+                        osg::notify(osg::NOTICE)<<"Error: end tag is not closed correctly"<<std::endl;
+                }
+                else
+                {
+                    bool result = childNode->read(input);
+                    if (!result) return false;
+                }
 
                 if (type==NODE && !children.empty()) type = GROUP;
@@ -388 +401 @@
                 fout<<"\"";
             }
-            fout<<">";
-
-            for(Children::const_iterator citr = children.begin();
-                citr != children.end();
-                ++citr)
-            {
-                (*citr)->write(fout);
-            }
-
-            if (!contents.empty()) writeString(fout,contents);
-
-            fout<<"</"<<name<<">"<<std::endl;
+
+            if (children.empty())
+            {
+                fout<<" />"<<std::endl;
+            }
+            else
+            {
+                fout<<">";
+                for(Children::const_iterator citr = children.begin();
+                    citr != children.end();
+                    ++citr)
+                {
+                    (*citr)->write(fout);
+                }
+
+                if (!contents.empty()) writeString(fout,contents);
+
+                fout<<"</"<<name<<">"<<std::endl;
+            }
             return true;
         }