Normalize xml processing

[anna.git] / source / xml / Compiler.cpp

diff --git a/source/xml/Compiler.cpp b/source/xml/Compiler.cpp
index 483e86e..1cbc286 100644 (file)
--- a/source/xml/Compiler.cpp
+++ b/source/xml/Compiler.cpp
@@ -7,6 +7,7 @@
 
 
 #include <anna/core/mt/Guard.hpp>
+#include <anna/core/util/defines.hpp>
 
 #include <anna/xml/Compiler.hpp>
 #include <anna/xml/Node.hpp>
@@ -16,6 +17,10 @@
 #include <anna/xml/Document.hpp>
 #include <anna/xml/Namespace.hpp>
 
+#include <algorithm>
+#include <cstring>
+
+
 using namespace anna;
 using namespace anna::xml;
 
@@ -133,7 +138,7 @@ throw(RuntimeException) {
   const Namespace* ns;
 
   for(int i = 0; i < level; i ++)
-    result += ANNA_XML_COMPILER_TAB;
+    result += std::string(ANNA_XML_INDENTATION_SPACES, ' ');
 
   result += '<';
   writeFullName(node, result, flags);
@@ -150,6 +155,13 @@ throw(RuntimeException) {
     }
   }
 
+  // Sort node attributes (this is a compiler used for on-demand representation, this sorting is not permanent in the object which uses it):
+  if(flags & Mode::Sort) {
+    Node *nc_node = const_cast<Node*>(node);
+    std::sort(nc_node->attribute_begin(), nc_node->attribute_end(),
+              [](Attribute *a, Attribute *b) { return (std::strcmp(a->getName(), b->getName()) < 0); }); // sort alphabetically by attribute name
+  }
+
   for(Node::const_attribute_iterator ii = node->attribute_begin(), maxii = node->attribute_end(); ii != maxii; ii ++) {
     attribute = Node::attribute(ii);
     result += ' ';
@@ -203,7 +215,7 @@ throw(RuntimeException) {
 void Compiler::close(const Node* node, Result& result, const int level, const int flags)
 throw(RuntimeException) {
   for(int i = 0; i < level; i ++)
-    result += ANNA_XML_COMPILER_TAB;
+    result += std::string(ANNA_XML_INDENTATION_SPACES, ' ');
 
   result += "</";
   writeFullName(node, result, flags);