X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fcodec%2FMessage.cpp;h=a686c71dcf33e327eaaa840ed7704395032f1f85;hb=e782294456d0877aa8fc05aa931291ac79808eb3;hp=0ea876b8da8cdaf1ac328c93dd24ce3d583fdce1;hpb=5406b19bdbfe101b264f8c4d878392e2916b8f9d;p=anna.git diff --git a/source/diameter/codec/Message.cpp b/source/diameter/codec/Message.cpp index 0ea876b..a686c71 100644 --- a/source/diameter/codec/Message.cpp +++ b/source/diameter/codec/Message.cpp @@ -761,15 +761,25 @@ const anna::DataBlock & Message::code() throw(anna::RuntimeException) { } //------------------------------------------------------------------------------ -//----------------------------------------------------------- Message::loadXML() +//------------------------------------------------------- Message::loadXMLFile() //------------------------------------------------------------------------------ -void Message::loadXML(const std::string &xmlPathFile) throw(anna::RuntimeException) { +void Message::loadXMLFile(const std::string &xmlPathFile) throw(anna::RuntimeException) { anna::xml::DocumentFile xmlDocument; anna::diameter::codec::functions::messageXmlDocumentFromXmlFile(xmlDocument, xmlPathFile); fromXML(xmlDocument.getRootNode()); } +//------------------------------------------------------------------------------ +//----------------------------------------------------- Message::loadXMLString() +//------------------------------------------------------------------------------ +void Message::loadXMLString(const std::string &xmlString) throw(anna::RuntimeException) { + + anna::xml::DocumentMemory xmlDocument; + anna::diameter::codec::functions::messageXmlDocumentFromXmlString(xmlDocument, xmlString); + fromXML(xmlDocument.getRootNode()); +} + //------------------------------------------------------------------------------ //----------------------------------------------------------- Message::fromXML() //------------------------------------------------------------------------------ @@ -988,9 +998,16 @@ anna::xml::Node* Message::asXML(anna::xml::Node* parent) const throw() { //------------------------------------------------------------------------------ //------------------------------------------------------- Message::asXMLString() //------------------------------------------------------------------------------ -std::string Message::asXMLString() const throw() { +std::string Message::asXMLString(bool normalize) const throw() { anna::xml::Node root("root"); - return anna::xml::Compiler().apply(asXML(&root)); + + anna::xml::Compiler::Mode::_v mode = normalize ? anna::xml::Compiler::Mode::Sort : anna::xml::Compiler::Mode::Visual; + std::string result = anna::xml::Compiler().apply(asXML(&root), mode); + + if (normalize) + result.erase(std::remove(result.begin(), result.end(), '\n'), result.end()); + + return result; } @@ -999,5 +1016,6 @@ std::string Message::asXMLString() const throw() { //------------------------------------------------------------------------------ bool Message::isLike(const std::string &pattern) const throw() { anna::RegularExpression re(pattern); - return re.isLike(asXMLString()); + return re.isLike(asXMLString(true /* normalize by mean sorting attribute names and removing new lines */)); } +