#2808, #2807, #2806, #2805, #2804 BBTK Feature New Normal Add new functionality MathO...

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

diff --git a/kernel/src/bbtkXML.h b/kernel/src/bbtkXML.h
index a44508d23ba013120a7e607c071538db68570a20..83d3a00ee17dc8028aff380f0b0040e710fd0a81 100644 (file)
--- a/kernel/src/bbtkXML.h
+++ b/kernel/src/bbtkXML.h
@@ -1,3 +1,40 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
+  Program:   bbtk
+  Module:    $RCSfile: bbtkXML.h,v $
+  Language:  C++
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.6 $
+=========================================================================*/
+
+
+
 #ifndef __bbtkXML_h_INCLUDED__
 #define __bbtkXML_h_INCLUDED__
 
@@ -6,17 +43,31 @@
 
 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 
@@ -26,7 +77,6 @@ namespace bbtk
   }
   //====================================================================
 
-
   std::string GetErrorMessage(XMLResults* res, const std::string& filename)
   {
     std::ostringstream str;
@@ -35,7 +85,6 @@ namespace bbtk
     str << " file "<<filename; 
     return str.str();
   }
-
 };
 
 #endif