X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fxml%2FParser.cpp;h=30c2909bb9274b646293bb9c03870e3110d8cfb3;hb=ab67c412220051d6a96be8c65179ee29712bf006;hp=c2b10864cdafead6b05dc191c83440170a2f9293;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git diff --git a/source/xml/Parser.cpp b/source/xml/Parser.cpp index c2b1086..30c2909 100644 --- a/source/xml/Parser.cpp +++ b/source/xml/Parser.cpp @@ -2,7 +2,7 @@ // // (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo // -// https://bitbucket.org/testillano/anna +// http://redmine.teslayout.com/projects/anna-suite // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions @@ -14,7 +14,7 @@ // copyright notice, this list of conditions and the following disclaimer // in the documentation and/or other materials provided with the // distribution. -// * Neither the name of Google Inc. nor the names of its +// * Neither the name of the copyright holder nor the names of its // contributors may be used to endorse or promote products derived from // this software without specific prior written permission. // @@ -125,8 +125,8 @@ throw(RuntimeException) { const char* w; while(xmlNode != NULL) { - switch(xmlNode->type) { - case XML_ELEMENT_NODE: + + if((xmlNode->type) == XML_ELEMENT_NODE) { child = node->createChild((const char*) xmlNode->name); for(xmlNs* ns = xmlNode->nsDef; ns != NULL; ns = ns->next) @@ -138,8 +138,8 @@ throw(RuntimeException) { attributes(child, xmlNode->properties); children(child, xmlNode->children); - break; - case XML_TEXT_NODE: + } + else if((xmlNode->type) == XML_TEXT_NODE) { w = (const char*) xmlNode->content; isSeparator = true; @@ -148,16 +148,14 @@ throw(RuntimeException) { isSeparator = false; break; } - w ++; } if(isSeparator == false) node->createText(decode(xmlNode->content)); - - break; } + xmlNode = xmlNode->next; } }