From d6e2dea1b245ee5de3d7a0e1c9524629b524ee63 Mon Sep 17 00:00:00 2001 From: guigues Date: Thu, 14 Feb 2008 09:32:54 +0000 Subject: [PATCH 1/1] *** empty log message *** --- kernel/src/bbtkConfigurationFile.cxx | 731 +++++++++++++-------------- kernel/src/bbtkConfigurationFile.h | 207 ++++---- kernel/src/bbtkXML.h | 30 ++ 3 files changed, 492 insertions(+), 476 deletions(-) create mode 100644 kernel/src/bbtkXML.h diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx index e398286..634d517 100644 --- a/kernel/src/bbtkConfigurationFile.cxx +++ b/kernel/src/bbtkConfigurationFile.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkConfigurationFile.cxx,v $ Language: C++ - Date: $Date: 2008/02/13 14:08:25 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/02/14 09:32:54 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -22,8 +22,8 @@ #include "bbtkConfigurationFile.h" #include "bbtkMessageManager.h" -//#include "xmlParser.h" -#include // for struct stat stFileInfo +#include "bbtkXML.h" +#include "bbtkUtilities.h" #if defined(WIN32) #include // for getcwd @@ -31,308 +31,320 @@ namespace bbtk { -/// Constructor -ConfigurationFile::ConfigurationFile() -{ - char *execPath = GetExecutablePath(); - - #if defined(WIN32) - std::string slash("\\"); - #else - std::string slash("/"); - #endif - - // ==> Set system paths - mBin_path = execPath; - mInstall_path = mBin_path + slash + ".."; - // The relative path to the doc folder (=BBTK_DOC_REL_PATH) - mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH); - // The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path) - mDoc_path = mInstall_path + slash + mDoc_rel_path; - // The relative path to the doc folder (=BBTK_BBS_REL_PATH) - mBbs_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_BBS_REL_PATH); - // The path to the bbs folder (=mInstall_path+"/"+mBbs_rel_path) - mBbs_path = mInstall_path + slash + mBbs_rel_path; - // The relative path to the rsc folder (=BBTK_RSC_REL_PATH) - // mRsc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_RSC_REL_PATH); - // The path to the rsc folder (=mInstall_path+"/"+mRsc_rel_path) - // mRsc_path = mInstall_path + slash + mRsc_rel_path; - // The path to the bbtk data folder - // Initialized to mInstall_path+"/"+BBTK_DATA_REL_PATH - // But can be overriden by value read from bbtk_config.xml - mData_path = mInstall_path + slash + BBTK_STRINGIFY_SYMBOL(BBTK_DATA_REL_PATH); - // MessageManager::SetMessageLevel("Config",1); - bbtkMessage("Config",1," ==> bin : '"< prefix : '"< doc : '"< bbs : '"< rsc : '"< data : '"< First we look for bbtk_config.xml in "." - char buf[2048]; - const char *currentDir = getcwd(buf, 2048); - - if( !currentDir ) - { - std::cerr << "Path was too long to fit on 2048 bytes ?!?" << std::endl; - // \todo : what else? - // How abort a constructor and warn the caller function? - // LG : throw an exception - } - - std::string configXmlFullPathName = currentDir + slash + "bbtk_config.xml"; - - if ( FileExists( configXmlFullPathName )) - { - bbtkMessage("Config",1, "ConfigurationFile : [" << configXmlFullPathName << - "] found in current directory" << std::endl); - //Read(configXmlFullPathName.c_str()); - // traiter le fichier local - } -// ==> Then we look for bbtk_config.xml in ".bbtk" - else - { - #if defined(__GNUC__) - std::string str_home(getenv("HOME")); - #elif defined(_WIN32) - std::string str_home(getenv("USERPROFILE")); - #endif - configXmlFullPathName = str_home + slash + ".bbtk/bbtk_config.xml"; - if (!FileExists( configXmlFullPathName )) - { - // ==> Nothing found, we create bbtk_config.xml in ".bbtk" - InstallPath (); + //==================================================================== + /// Constructor + ConfigurationFile::ConfigurationFile() + { + // file separator +#if defined(_WIN32) + mFile_separator = "\\"; +#else + mFile_separator = "/"; +#endif + + // ==> Set system paths + mBin_path = GetExecutablePath(); + mInstall_path = mBin_path + mFile_separator + ".."; + // The relative path to the doc folder (=BBTK_DOC_REL_PATH) + mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH); + // The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path) + mDoc_path = mInstall_path + mFile_separator + mDoc_rel_path; + // The relative path to the doc folder (=BBTK_BBS_REL_PATH) + mBbs_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_BBS_REL_PATH); + // The path to the bbs folder (=mInstall_path+"/"+mBbs_rel_path) + mBbs_path = mInstall_path + mFile_separator + mBbs_rel_path; + // The relative path to the rsc folder (=BBTK_RSC_REL_PATH) + // mRsc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_RSC_REL_PATH); + // The path to the rsc folder (=mInstall_path+"/"+mRsc_rel_path) + // mRsc_path = mInstall_path + mFile_separator + mRsc_rel_path; + // The path to the bbtk data folder + // Initialized to mInstall_path+"/"+BBTK_DATA_REL_PATH + // But can be overriden by value read from bbtk_config.xml + mData_path = mInstall_path + mFile_separator + BBTK_STRINGIFY_SYMBOL(BBTK_DATA_REL_PATH); + //MessageManager::SetMessageLevel("Config",1); + bbtkMessage("Config",1," ==> bin : '"< prefix : '"< doc : '"< bbs : '"< rsc : '"< data : '"< First we look for bbtk_config.xml in "." + char buf[2048]; + const char *currentDir = getcwd(buf, 2048); + + if( !currentDir ) + { + std::cerr << "Path was too long to fit on 2048 bytes ?!?" << std::endl; + // \todo : what else? + // How abort a constructor and warn the caller function? + // LG : throw an exception } - } + + std::string configXmlFullPathName = currentDir + mFile_separator + "bbtk_config.xml"; + + if ( Utilities::FileExists( configXmlFullPathName )) + { + bbtkMessage("Config",1, "ConfigurationFile : [" << configXmlFullPathName << + "] found in current directory" << std::endl); + //Read(configXmlFullPathName.c_str()); + // traiter le fichier local + } + + // ==> Then we look for bbtk_config.xml in ".bbtk" + else + { +#if defined(__GNUC__) + std::string str_home(getenv("HOME")); +#elif defined(_WIN32) + std::string str_home(getenv("USERPROFILE")); +#endif + configXmlFullPathName = str_home + mFile_separator + ".bbtk/bbtk_config.xml"; + if (!Utilities::FileExists( configXmlFullPathName )) + { + // ==> Nothing found, we create bbtk_config.xml in ".bbtk" + InstallPath (); + } + } + + // In any case, deal with bbtk_config.xml! + Read(configXmlFullPathName.c_str()); + } + //========================================================================= -// In any case, deal with bbtk_config.xml! - Read(configXmlFullPathName.c_str()); -} + //========================================================================= + /// Destructor + ConfigurationFile::~ConfigurationFile() + { + } + //========================================================================= + -/// Destructor -ConfigurationFile::~ConfigurationFile() -{ -} -// See : http://www.techbytes.ca/techbyte103.html for more O.S. -bool ConfigurationFile::FileExists(std::string strFilename) { - struct stat stFileInfo; - bool blnReturn; - int intStat; - // Attempt to get the file attributes - intStat = stat(strFilename.c_str(),&stFileInfo); - if(intStat == 0) { - // We were able to get the file attributes - // so the file obviously exists. - blnReturn = true; - } else { - // We were not able to get the file attributes. - // This may mean that we don't have permission to - // access the folder which contains this file. If you - // need to do that level of checking, lookup the - // return values of stat which will give you - // more details on why stat failed. - blnReturn = false; + //========================================================================= + void ConfigurationFile::CreateConfigXML( char *rootDirectory ) + { + FILE *fp; + char configXml[250]; + sprintf (configXml , "%s/bbtk_config.xml", rootDirectory); + bbtkMessage("Config",1, "in CreateConfigXML[" << configXml << "]" << std::endl); + fp = fopen (configXml, "w"); + fprintf(fp, "\n"); + // fprintf(fp, "\n"); + fprintf(fp, "\n"); + fprintf(fp, " \n"); + // fprintf(fp, " http://www.creatis.insa-lyon.fr/software/bbtk \n"); + // fprintf(fp, " \n"); + fprintf(fp, " \n"); + // fprintf(fp, " \n"); + fprintf(fp, " \n"); + fprintf(fp, " \n");//, BBTK_DATA_PATH); + /// \todo find a decent default value ! + ///fprintf(fp, " %s \n", " "); + // when $ will be found, default_temp_dir value will be replaced + fprintf(fp, " $\n"); + fprintf(fp, "\n"); + fclose(fp); } - - return(blnReturn); -} + //========================================================================= -void ConfigurationFile::CreateConfigXML( char *rootDirectory ) -{ - FILE *fp; - char configXml[250]; - sprintf (configXml , "%s/bbtk_config.xml", rootDirectory); - bbtkMessage("Config",1, "in CreateConfigXML[" << configXml << "]" << std::endl); - fp = fopen (configXml, "w"); - fprintf(fp, "\n"); - // fprintf(fp, "\n"); - fprintf(fp, "\n"); - fprintf(fp, " \n"); - // fprintf(fp, " http://www.creatis.insa-lyon.fr/software/bbtk \n"); - // fprintf(fp, " \n"); - fprintf(fp, " \n"); - // fprintf(fp, " \n"); - fprintf(fp, " \n"); - fprintf(fp, " \n");//, BBTK_DATA_PATH); - /// \todo find a decent default value ! - ///fprintf(fp, " %s \n", " "); - // when $ will be found, default_temp_dir value will be replaced - fprintf(fp, " $\n"); - fprintf(fp, "\n"); - fclose(fp); -} - -char *ConfigurationFile::GetExecutablePath() -{ + //========================================================================= + std::string ConfigurationFile::GetExecutablePath() + { /// \todo : Think to delete it! char *buf = (char *)malloc(512); char *slash; - + #if defined(WIN32) GetModuleFileName(NULL, buf, 511); slash = strrchr(buf, '\\'); if (slash) - { + { *slash = 0; - } + } #elif defined(__GNUC__) int res; res = readlink("/proc/self/exe", buf, 512); if (res == -1) - return ""; + return ""; buf[res] = 0; slash = strrchr(buf, '/'); if (slash) - { + { *slash = 0; - } + } #else return ""; #endif + std::string ret(buf); + free(buf); + return ret; + } + //========================================================================= - return buf; -} - - - -void ConfigurationFile::InstallPath () -{ - -/*-------------------------------------------------- -New policy for bbtk_config.xml : - -if bbtk_config.xml found in current directory (user is an aware user!) - use it! - -else if bbtk_config.xml found in HOME/.bbtk (user already worked with it) - use it! - -else if bbtk_config.xml.tmp found in /usr/local/bin or c:\\Program Files\\BBTK\\bin - copy it as .bbtk/bbtk_config.xml - -else (nothing installed) - create a minimum version in HOME/.bbtk -----------------------------------------------------*/ - - -// ----------------------------------------------------------------- -#if defined(__GNUC__) - -// ------------------ create some usefull strings ---------------- -// installed bbtk_path - char bbtk_path[100]; - strcpy(bbtk_path, "/usr/local/bin"); - -// rootDirectory - char rootDirectory[200]; - sprintf( rootDirectory, "%s/.bbtk", getenv("HOME")); - -// configPath - char configPath[200]; - sprintf(configPath, "%s/bbtk_config.xml",rootDirectory); - -// makeDir - char makeDir[250]; - sprintf( makeDir, "mkdir \"%s\" ", rootDirectory); - -// configXmlTmp - char configXmlTmp[250]; - sprintf(configXmlTmp, "%s/bbtk_config.xml.tmp", bbtk_path); - -// copyFile - char copyFile[250]; - - if (!FileExists(configXmlTmp)) // bbtk_config.xml.tmp not found (not installed) - { - if (!FileExists(rootDirectory)) // .bbtk not found - { - system(makeDir); // create .bbtk - } - // if "bbtk_path/bbtk_config.xml.tmp" doesn't exist, hard-create a minimum version in .bbtk - CreateConfigXML( rootDirectory );// create .bbtk - } - else + //========================================================================= + void ConfigurationFile::InstallPath () { - sprintf(copyFile,"cp %s %s/bbtk_config.xml ",configXmlTmp,rootDirectory ); - if (!FileExists(rootDirectory)) - { - //std::cout << "makeDir[" << makeDir << "]" << std::endl; - system(makeDir); - } - - if (!FileExists(configPath)) - { - system(copyFile); - } - } - return; - -// ------------------------------------------------------------------ + + /*-------------------------------------------------- + New policy for bbtk_config.xml : + + if bbtk_config.xml found in current directory (user is an aware user!) + use it! + + else if bbtk_config.xml found in HOME/.bbtk (user already worked with it) + use it! + + else if bbtk_config.xml.tmp found in /usr/local/bin or c:\\Program Files\\BBTK\\bin + copy it as .bbtk/bbtk_config.xml + + else (nothing installed) + create a minimum version in HOME/.bbtk + ----------------------------------------------------*/ + + + // ----------------------------------------------------------------- +#if defined(__GNUC__) + + // ------------------ create some usefull strings ---------------- + // installed bbtk_path + char bbtk_path[100]; + strcpy(bbtk_path, "/usr/local/bin"); + + // rootDirectory + char rootDirectory[200]; + sprintf( rootDirectory, "%s/.bbtk", getenv("HOME")); + + // configPath + char configPath[200]; + sprintf(configPath, "%s/bbtk_config.xml",rootDirectory); + + // makeDir + char makeDir[250]; + sprintf( makeDir, "mkdir \"%s\" ", rootDirectory); + + // configXmlTmp + char configXmlTmp[250]; + sprintf(configXmlTmp, "%s/bbtk_config.xml.tmp", bbtk_path); + + // copyFile + char copyFile[250]; + + if (!Utilities::FileExists(configXmlTmp)) // bbtk_config.xml.tmp not found (not installed) + { + if (!Utilities::FileExists(rootDirectory)) // .bbtk not found + { + system(makeDir); // create .bbtk + } + + // if "bbtk_path/bbtk_config.xml.tmp" doesn't exist, hard-create a minimum version in .bbtk + CreateConfigXML( rootDirectory );// create .bbtk + } + else + { + sprintf(copyFile,"cp %s %s/bbtk_config.xml ",configXmlTmp,rootDirectory ); + if (!Utilities::FileExists(rootDirectory)) + { + //std::cout << "makeDir[" << makeDir << "]" << std::endl; + system(makeDir); + } + + if (!Utilities::FileExists(configPath)) + { + system(copyFile); + } + } + return; + + // ------------------------------------------------------------------ #elif defined(WIN32) - - -// installed bbtk_path - char bbtk_path[100]; - strcpy(bbtk_path, "\"c:\\Program Files\\BBTK\\bin\""); - char bbtk_path2[100]; - strcpy(bbtk_path2, "c:\\Program Files\\BBTK\\bin"); - -// rootDirectory - char rootDirectory[200]; - sprintf(rootDirectory, "%s\\.bbtk",getenv("USERPROFILE")); - // std::cout << "[" << rootDirectory << "]" << std::endl; - -// configPath - char configPath[200]; - sprintf(configPath, "%s\\bbtk_config.xml",rootDirectory); - -// makeDir - char makeDir[250]; - sprintf( makeDir, "mkdir \"%s\" ", rootDirectory); - -// configXmlTmp - char configXmlTmp[250]; - sprintf(configXmlTmp, "%s\\bbtk_config.xml.tmp", bbtk_path2); -// copyFile - char copyFile[250]; - - if (!FileExists(configXmlTmp)) // bbtk_config.xml.tmp not found - { - if (!FileExists(rootDirectory)) // .bbtk not found - { - system(makeDir); // create .bbtk - } - - // if "bbtk_path/bbtk_config.xml.tmp" doesn't exist, hard-create a minimum version in .bbtk - CreateConfigXML( rootDirectory );// create .bbtk - return; - } - - sprintf(copyFile,"copy %s\\bbtk_config.xml.tmp \"%s\"\\bbtk_config.xml ",bbtk_path,rootDirectory ); - - int attribs = GetFileAttributes (rootDirectory); - bbtkMessage("Config",1,std::hex << attribs << " " << FILE_ATTRIBUTE_DIRECTORY << std::endl); - if ( attribs != 0xFFFFFFFF){ - if ((attribs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY ) /// \TODO : check ! - { - if ( GetFileAttributes( configPath ) == 0xFFFFFFFF) + + // installed bbtk_path + char bbtk_path[100]; + strcpy(bbtk_path, "\"c:\\Program Files\\BBTK\\bin\""); + char bbtk_path2[100]; + strcpy(bbtk_path2, "c:\\Program Files\\BBTK\\bin"); + + // rootDirectory + char rootDirectory[200]; + sprintf(rootDirectory, "%s\\.bbtk",getenv("USERPROFILE")); + // std::cout << "[" << rootDirectory << "]" << std::endl; + + // configPath + char configPath[200]; + sprintf(configPath, "%s\\bbtk_config.xml",rootDirectory); + + // makeDir + char makeDir[250]; + sprintf( makeDir, "mkdir \"%s\" ", rootDirectory); + + // configXmlTmp + char configXmlTmp[250]; + sprintf(configXmlTmp, "%s\\bbtk_config.xml.tmp", bbtk_path2); + + // copyFile + char copyFile[250]; + + if (!Utilities::FileExists(configXmlTmp)) // bbtk_config.xml.tmp not found { - system(copyFile); + if (!Utilities::FileExists(rootDirectory)) // .bbtk not found + { + system(makeDir); // create .bbtk + } + + // if "bbtk_path/bbtk_config.xml.tmp" doesn't exist, hard-create a minimum version in .bbtk + CreateConfigXML( rootDirectory );// create .bbtk + return; + } + + sprintf(copyFile,"copy %s\\bbtk_config.xml.tmp \"%s\"\\bbtk_config.xml ",bbtk_path,rootDirectory ); + + int attribs = GetFileAttributes (rootDirectory); + bbtkMessage("Config",1,std::hex << attribs << " " << FILE_ATTRIBUTE_DIRECTORY << std::endl); + if ( attribs != 0xFFFFFFFF) + { + if ((attribs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY ) /// \TODO : check ! + { + if ( GetFileAttributes( configPath ) == 0xFFFFFFFF) + { + system(copyFile); + } + } } - } - } else { - system(makeDir); - system(copyFile); - } - return; -// ------------------------------------------------------------------ + else + { + system(makeDir); + system(copyFile); + } + return; + // ------------------------------------------------------------------ #else /// \todo ConfigurationFile::InstallPath() : exit when for not WIN32 and not__GNUC__ @@ -340,110 +352,87 @@ else (nothing installed) #endif } - -void ConfigurationFile::GetTextOrClear(const XMLNode& node, std::string& var) -{ - if (node.nText()>0) - { - var = node.getText(); - } - else if (node.nClear()>0) - { - var = node.getClear().lpszValue; - } - else - { - std::string mess("Error : element <"); - mess += node.getName(); - mess += "> : no text nor 
 clear tag found";
-    }
-}
+  //=========================================================================
 
 
-// Gets the list of directories holding bb scripts, packages, dll, ... from the xml file
-//      bbtk_config.xml
-
-void ConfigurationFile::Read(const std::string& filename)
-{
 
-  //std::cout << "=======================in  ConfigurationFile::Read filename [" <error != eXMLErrorNone ) 
-    {
-      std::ostringstream str;
-      str << XMLNode::getError(res->error);
-      str << " [line " << res->nLine << ", col "<nColumn<<"] ";
-      str << " file "<error != eXMLErrorNone ) 
+      {
+	std::ostringstream str;
+	str << XMLNode::getError(res->error);
+	str << " [line " << res->nLine << ", col "<nColumn<<"] ";
+	str << " file "<
-#include "xmlParser.h"
 #include 
 #include 
 #include 
@@ -46,113 +45,111 @@
 
 namespace bbtk
 {
-//==========================================================================
-class BBTK_EXPORT  ConfigurationException
-{
-public:
-  ConfigurationException(const std::string& message) : mMessage(message) {}
-
-  std::string mMessage;
-};
-
-
-//==========================================================================
-class BBTK_EXPORT ConfigurationFile
-{
-public:
-
-  static ConfigurationFile const &GetInstance()
+  //==========================================================================
+  class BBTK_EXPORT  ConfigurationException
   {
-    static ConfigurationFile f;
-    return f;
-  }
-
-  ~ConfigurationFile();
-
-private:
-  ConfigurationFile();
-  void InstallPath ();
-
-public:
-  inline const std::string& Get_description() const
-     { return mDescription;}
-  inline const std::string& Get_url() const
-     { return mUrl;}
-  inline const std::string& Get_data_path() const
-     { return mData_path;}  
-  inline const std::string& Get_file_separator() const
-     { return mFile_separator;}
-
-  inline const std::string& Get_bin_path() const
-     { return mBin_path;}
-  inline const std::string& Get_install_path() const
-     { return mInstall_path;}
-  inline const std::string& Get_doc_path() const
-     { return mDoc_path;}
-  inline const std::string& Get_rsc_path() const
-     { return mRsc_path;}
-
-  inline const std::vector& Get_bbs_paths() const
-     { return mBbs_paths;}
-  inline const std::vector& Get_package_paths() const
-     { return mPackage_paths;}
-  inline const std::string& Get_config_xml_full_path() const
-     { return mConfig_xml_full_path;}
-  inline const std::string& Get_default_temp_dir() const
-     { return mDefault_temp_dir;}
-           
+  public:
+    ConfigurationException(const std::string& message) : mMessage(message) {}
+    
+    std::string mMessage;
+  };
+  //==========================================================================
+  
+  //==========================================================================
+  class BBTK_EXPORT ConfigurationFile
+  {
+  public:
+    
+    static ConfigurationFile const &GetInstance()
+    {
+      static ConfigurationFile f;
+      return f;
+    }
+    
+    ~ConfigurationFile();
+    
+  private:
+    ConfigurationFile();
+    void InstallPath ();
+    
+  public:
+    inline const std::string& Get_description() const
+    { return mDescription;}
+    inline const std::string& Get_url() const
+    { return mUrl;}
+    inline const std::string& Get_data_path() const
+    { return mData_path;}  
+    inline const std::string& Get_file_separator() const
+    { return mFile_separator;}
+    
+    inline const std::string& Get_bin_path() const
+    { return mBin_path;}
+    inline const std::string& Get_install_path() const
+    { return mInstall_path;}
+    inline const std::string& Get_doc_path() const
+    { return mDoc_path;}
+    inline const std::string& Get_rsc_path() const
+    { return mRsc_path;}
+    
+    inline const std::vector& Get_bbs_paths() const
+    { return mBbs_paths;}
+    inline const std::vector& Get_package_paths() const
+    { return mPackage_paths;}
+    inline const std::string& Get_config_xml_full_path() const
+    { return mConfig_xml_full_path;}
+    inline const std::string& Get_default_temp_dir() const
+    { return mDefault_temp_dir;}
+    
   private:
-  void Read(const std::string& fileName);
-  void GetTextOrClear(const XMLNode& node, std::string& var); 
-  char *GetExecutablePath();
-  bool FileExists(std::string strFilename);
-  void CreateConfigXML( char *rootDirectory );
+    void Read(const std::string& fileName);
+     std::string GetExecutablePath();
+     void CreateConfigXML( char *rootDirectory );
     
-// Attributes :
+    // Attributes :
   private :
-  std::string mDescription; 
-  /// Where is the file bbtk_config.xml
-  std::string mConfig_xml_full_path;  
-
-  /// Set automatically :
-  /// The path to the executable (usually bbi)
-  std::string mBin_path;
-  /// The path to the install prefix (=mBinPath+"/..")
-  std::string mInstall_path;
-  /// The relative path to the doc folder (=BBTK_DOC_REL_PATH)
-  std::string mDoc_rel_path;
-  /// The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path)
-  std::string mDoc_path;
-  /// The relative path to the doc folder (=BBTK_BBS_REL_PATH)
-  std::string mBbs_rel_path;
-  /// The path to the bbs folder (=mInstall_path+"/"+mBbs_rel_path)
-  std::string mBbs_path;
-  /// The relative path to the rsc folder (=BBTK_RSC_REL_PATH)
-  std::string mRsc_rel_path;
-  /// The path to the rsc folder (=mInstall_path+"/"+mRsc_rel_path)
-  std::string mRsc_path;
-  /// The path to the bbtk data folder 
-  /// Initialized to mInstall_path+"/"+BBTK_DATA_REL_PATH
-  /// But can be overriden by value read from bbtk_config.xml
-  std::string mData_path;
-
-  /// / or \, depending on the OS
-  std::string mFile_separator;
-
-  /// Read from bbtk_config.xml file
-  /// Where the doc is
-  std::string mUrl;
-  /// Scripts  
-  std::vector mBbs_paths; 
-  /// Package dlls    
-  std::vector mPackage_paths;
-  /// If Packages link against extern dlls
-  std::vector mExt_dll_paths;
-  /// Default directory for generating Graph
-  std::string mDefault_temp_dir;       
+    std::string mDescription; 
+    /// Where is the file bbtk_config.xml
+    std::string mConfig_xml_full_path;  
+    
+    /// Set automatically :
+    /// The path to the executable (usually bbi)
+    std::string mBin_path;
+    /// The path to the install prefix (=mBinPath+"/..")
+    std::string mInstall_path;
+    /// The relative path to the doc folder (=BBTK_DOC_REL_PATH)
+    std::string mDoc_rel_path;
+    /// The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path)
+    std::string mDoc_path;
+    /// The relative path to the doc folder (=BBTK_BBS_REL_PATH)
+    std::string mBbs_rel_path;
+    /// The path to the bbs folder (=mInstall_path+"/"+mBbs_rel_path)
+    std::string mBbs_path;
+    /// The relative path to the rsc folder (=BBTK_RSC_REL_PATH)
+    std::string mRsc_rel_path;
+    /// The path to the rsc folder (=mInstall_path+"/"+mRsc_rel_path)
+    std::string mRsc_path;
+    /// The path to the bbtk data folder 
+    /// Initialized to mInstall_path+"/"+BBTK_DATA_REL_PATH
+    /// But can be overriden by value read from bbtk_config.xml
+    std::string mData_path;
+    
+    /// / or \, depending on the OS
+    std::string mFile_separator;
+    
+    /// Read from bbtk_config.xml file
+    /// Where the doc is
+    std::string mUrl;
+    /// Scripts  
+    std::vector mBbs_paths; 
+    /// Package dlls    
+    std::vector mPackage_paths;
+    /// If Packages link against extern dlls
+    std::vector mExt_dll_paths;
+    /// Temp directory for generated data
+    std::string mDefault_temp_dir;       
   };
-
-
+  
+  
 }// namespace bbtk
 
 
diff --git a/kernel/src/bbtkXML.h b/kernel/src/bbtkXML.h
new file mode 100644
index 0000000..ed46960
--- /dev/null
+++ b/kernel/src/bbtkXML.h
@@ -0,0 +1,30 @@
+#ifndef __bbtkXML_h_INCLUDED__
+#define __bbtkXML_h_INCLUDED__
+
+#include "xmlParser.h"
+
+
+namespace bbtk
+{
+  //====================================================================
+  inline bool GetTextOrClear(const XMLNode& node, std::string& var)
+  {
+    if (node.nText()>0) 
+      {
+	var = node.getText();
+	return true;
+      }
+    else if (node.nClear()>0) 
+      {
+	var = node.getClear().lpszValue;
+	return true;
+      }
+    else 
+      {
+	return false;
+      }
+  }
+  //====================================================================
+};
+
+#endif
-- 
2.46.1