Last fixes (until next one)

[bbtk.git] / kernel / src / bbtkXML.h

diff --git a/kernel/src/bbtkXML.h b/kernel/src/bbtkXML.h
index ed46960debdd2f447e5bb38a0a9a6bd1f0164fb9..a9846c771ec3d3b571dad28e43a3ea7db6ca337a 100644 (file)
--- a/kernel/src/bbtkXML.h
+++ b/kernel/src/bbtkXML.h
@@ -2,21 +2,36 @@
 #define __bbtkXML_h_INCLUDED__
 
 #include "xmlParser.h"
-
+#include <sstream>
 
 namespace bbtk
 {
+
+       void CleanString_0D(std::string& var)
+       {
+               int i,size=var.length();
+               for (i=1 ; i<size ; i++ )
+               {
+                       if ((var[i-1]==13) && (var[i]==10) )
+                       {
+                               var[i-1]=32;  // space
+                       } //if
+               } // for
+       }
+
   //====================================================================
   inline bool GetTextOrClear(const XMLNode& node, std::string& var)
   {
     if (node.nText()>0) 
       {
        var = node.getText();
+       CleanString_0D(var);
        return true;
       }
     else if (node.nClear()>0) 
       {
        var = node.getClear().lpszValue;
+       CleanString_0D(var);
        return true;
       }
     else 
@@ -25,6 +40,17 @@ namespace bbtk
       }
   }
   //====================================================================
+
+
+  std::string GetErrorMessage(XMLResults* res, const std::string& filename)
+  {
+    std::ostringstream str;
+    str << XMLNode::getError(res->error);
+    str << " [line " << res->nLine << ", col "<<res->nColumn<<"] ";
+    str << " file "<<filename; 
+    return str.str();
+  }
+
 };
 
 #endif