Ensures normalization on waitfe/fc-xml operations

[anna.git] / source / diameter / codec / Avp.cpp

diff --git a/source/diameter/codec/Avp.cpp b/source/diameter/codec/Avp.cpp
index be51349..2338111 100644 (file)
--- a/source/diameter/codec/Avp.cpp
+++ b/source/diameter/codec/Avp.cpp
@@ -1425,9 +1425,11 @@ void Avp::fromXML(const anna::xml::Node* avpNode) throw(anna::RuntimeException)
     int i_aux = code->getIntegerValue();
 
     if(i_aux < 0) {
-      std::string msg = "Error processing avp <code '"; msg += code->getValue();
-      msg += "': negative values are not allowed";
-      throw anna::RuntimeException(msg, ANNA_FILE_LOCATION);
+      LOGWARNING(
+        std::string msg = "Error processing avp <code '"; msg += code->getValue();
+        msg += "': negative value read from xml";
+        anna::Logger::warning(msg, ANNA_FILE_LOCATION);
+      );
     }
 
     U24 u_code = i_aux;
@@ -1646,9 +1648,16 @@ anna::xml::Node* Avp::asXML(anna::xml::Node* parent) const throw() {
 //------------------------------------------------------------------------------
 //----------------------------------------------------------- Avp::asXMLString()
 //------------------------------------------------------------------------------
-std::string Avp::asXMLString() const throw() {
+std::string Avp::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;
 }
 
 
@@ -1657,5 +1666,6 @@ std::string Avp::asXMLString() const throw() {
 //------------------------------------------------------------------------------
 bool Avp::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 */));
 }
+