X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkConfigurationFile.cxx;h=eb2e31f70b45332621bff1271024d7ca90c8469f;hb=5e6e754f059d5fb6b25b883f89f76333228ba5c4;hp=634d5172ea5335a88238dabfba9781535c932ad0;hpb=d6e2dea1b245ee5de3d7a0e1c9524629b524ee63;p=bbtk.git

diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index 634d517..eb2e31f 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/14 09:32:54 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2008/03/10 06:24:12 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -29,6 +29,8 @@
 #include <direct.h> // for getcwd
 #endif
 
+
+
 namespace bbtk
 {
 
@@ -36,24 +38,23 @@ namespace bbtk
   /// Constructor
   ConfigurationFile::ConfigurationFile()
   {
-    // file separator
-#if defined(_WIN32)
-    mFile_separator = "\\";
-#else
-    mFile_separator = "/";
-#endif
+
+	mFile_separator = VALID_FILE_SEPARATOR;
     
-    // ==> Set system paths
+    // ==> Set system paths 
     mBin_path = GetExecutablePath();
-    mInstall_path = mBin_path + mFile_separator + "..";
+//EED    mInstall_path = mBin_path + mFile_separator + "..";
+    mInstall_path = mBin_path + "/..";
     // 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;
+//EED    mDoc_path = mInstall_path + mFile_separator + mDoc_rel_path;
+    mDoc_path = mInstall_path + "/" + 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;
+//EED    mBbs_path = mInstall_path + mFile_separator + mBbs_rel_path;
+    mBbs_path = mInstall_path + "/" + 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)
@@ -61,37 +62,69 @@ namespace bbtk
     // 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);
+//EED    mData_path = mInstall_path + mFile_separator + BBTK_STRINGIFY_SYMBOL(BBTK_DATA_REL_PATH);
+    mData_path = mInstall_path + "/" + BBTK_STRINGIFY_SYMBOL(BBTK_DATA_REL_PATH);
+
+	Utilities::replace( mBin_path		, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+	Utilities::replace( mInstall_path	, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+	Utilities::replace( mDoc_rel_path	, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+	Utilities::replace( mDoc_path		, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+	Utilities::replace( mBbs_path		, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+	Utilities::replace( mData_path		, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+
     bbtkMessage("Config",1," ==> bin    : '"<<mBin_path<<"'"<<std::endl);
     bbtkMessage("Config",1," ==> prefix : '"<<mInstall_path<<"'"<<std::endl);
     bbtkMessage("Config",1," ==> doc    : '"<<mDoc_path<<"'"<<std::endl);
     bbtkMessage("Config",1," ==> bbs    : '"<<mBbs_path<<"'"<<std::endl);
-    //   bbtkMessage("Config",1," ==> rsc    : '"<<mRsc_path<<"'"<<std::endl);
     bbtkMessage("Config",1," ==> data   : '"<<mData_path<<"'"<<std::endl);
-    
+
+
+
     
     // bbs_paths
     // always add "." (current working directory) at the begining
-    mBbs_paths.push_back("."); 
+	mBbs_paths.push_back( "." ); 
     // add system bbs path 
     mBbs_paths.push_back(mBbs_path);
+    // add toolsbbtk/appli 
+//EED    std::string toolsappli_rel_path(mFile_separator);
+    std::string toolsappli_rel_path("/");
+//EED    toolsappli_rel_path +=  "toolsbbtk" + mFile_separator + "appli";
+    toolsappli_rel_path +=  "toolsbbtk/appli";
+    mBbs_paths.push_back(mBbs_path + toolsappli_rel_path);
+
+	int iStrVec,sizeStrVec;
+
+	sizeStrVec = mBbs_paths.size();
+	for (iStrVec=0;iStrVec<sizeStrVec;iStrVec++){
+		Utilities::replace( mBbs_paths[iStrVec] , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+	}
+
     
     // always add "." (current working directory) at the begining
     mPackage_paths.push_back(".");   
-#ifdef UNIX
-    // add system bin path (for build tree)
-    // mPackage_paths.push_back(mBin_path);
+    // add system bin path (for build tree / standalone folder install)
+    mPackage_paths.push_back(mBin_path);
     // add system lib path (for install tree)
-    mPackage_paths.push_back(mInstall_path + mFile_separator + "lib");
-#endif
+//EED    mPackage_paths.push_back(mInstall_path + mFile_separator + "lib");
+    mPackage_paths.push_back(mInstall_path + "/lib");
 #ifdef WIN32
     // add bin/Debug bin/Release paths (for build/install tree)
-    mPackage_paths.push_back(mBin_path + mFile_separator + "Debug");
-    mPackage_paths.push_back(mBin_path + mFile_separator + "Release");
+//EED    mPackage_paths.push_back(mBin_path + mFile_separator + "Debug");
+    mPackage_paths.push_back(mBin_path + "/Debug");
+//EED    mPackage_paths.push_back(mBin_path + mFile_separator + "Release");
+    mPackage_paths.push_back(mBin_path + "/Release");
 #endif
-    
-    
+
+	sizeStrVec = mPackage_paths.size();
+	for (iStrVec=0;iStrVec<sizeStrVec;iStrVec++){
+		Utilities::replace( mPackage_paths[iStrVec] , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+	}
+
+
+
+    GetHelp(2);
+   
     // ==> First we look for bbtk_config.xml in "."
     char buf[2048];
     const char *currentDir = getcwd(buf, 2048);
@@ -104,8 +137,11 @@ namespace bbtk
 	// LG : throw an exception 
       }
     
-    std::string configXmlFullPathName = currentDir + mFile_separator + "bbtk_config.xml";
-    
+//    std::string configXmlFullPathName = currentDir + mFile_separator + "bbtk_config.xml";
+    std::string configXmlFullPathName = currentDir ;
+                configXmlFullPathName += "/bbtk_config.xml";
+	Utilities::replace( configXmlFullPathName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+
     if ( Utilities::FileExists( configXmlFullPathName ))
       {
 	bbtkMessage("Config",1, "ConfigurationFile : [" << configXmlFullPathName << 
@@ -122,7 +158,10 @@ namespace bbtk
 #elif defined(_WIN32)
 	std::string str_home(getenv("USERPROFILE"));
 #endif
-	configXmlFullPathName = str_home + mFile_separator + ".bbtk/bbtk_config.xml";
+//EED	configXmlFullPathName = str_home + mFile_separator + ".bbtk/bbtk_config.xml";
+	configXmlFullPathName = str_home + "/.bbtk/bbtk_config.xml";
+	Utilities::replace( configXmlFullPathName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+
 	if (!Utilities::FileExists( configXmlFullPathName ))
 	  {         
 	    // ==> Nothing found, we create bbtk_config.xml in ".bbtk"
@@ -363,7 +402,7 @@ namespace bbtk
   void ConfigurationFile::Read(const std::string& filename)
   {
     
-    //std::cout << "=======================in  ConfigurationFile::Read filename [" <<filename << "]" << std::endl;
+    bbtkDebugMessage("Config",1,"ConfigurationFile::Read(" <<filename << ")" << std::endl);
     
     mConfig_xml_full_path = filename;
     XMLResults* res = new XMLResults;
@@ -371,17 +410,15 @@ namespace bbtk
     
     if ( res->error != eXMLErrorNone ) 
       {
-	std::ostringstream str;
-	str << XMLNode::getError(res->error);
-	str << " [line " << res->nLine << ", col "<<res->nColumn<<"] ";
-	str << " file "<<filename; 
+	std::string mess = GetErrorMessage(res,filename);
 	delete res;
-	bbtkError(str.str());
-	//      throw ConfigurationException(str.str());
+	bbtkDebugMessage("Config",1,mess<< std::endl);
+ 	bbtkError(mess);
       }
     delete res;
     
-    
+    bbtkDebugMessage("Config",1,"OK" << std::endl);
+  
     int i,j;
     
     // Description
@@ -431,8 +468,53 @@ namespace bbtk
 	size_t pos = mConfig_xml_full_path.find("bbtk_config.xml");
 	mDefault_temp_dir = mConfig_xml_full_path.substr (0,pos); 
       }    
-    
+
+    GetHelp(2);
   }
   //=========================================================================
+  
+
+  //=========================================================================
+  void ConfigurationFile::GetHelp(int level) const
+  {
+    bbtkDebugMessageInc("Config",9,"ConfigurationFile::GetHelp("<<level
+			<<")"<<std::endl);
+    
+    const std::string config_xml_full_path      = Get_config_xml_full_path();    
+    const std::string description               = Get_description();
+    const std::string url                       = Get_doc_path();
+    const std::string data_path                 = Get_data_path();
+    const std::string default_temp_dir          = Get_default_temp_dir();    
+    const std::string file_separator            = Get_file_separator();    
+    const std::vector<std::string>bbs_paths     = Get_bbs_paths();
+    const std::vector<std::string>package_paths = Get_package_paths();
+    
+    bbtkMessage("Help",level, "============="   << std::endl);           
+    bbtkMessage("Help",level, "Configuration"   << std::endl);
+    bbtkMessage("Help",level, "============="   << std::endl);
+    bbtkMessage("Help",level, "bbtk_config.xml    : [" << config_xml_full_path  << "]" << std::endl); 
+    bbtkMessage("Help",level, "Documentation Path : [" << url             << "]" << std::endl);
+    bbtkMessage("Help",level, "Data Path          : [" << data_path       << "]" << std::endl);
+    bbtkMessage("Help",level, "Temp Directory     : [" << default_temp_dir << "]" << std::endl);
+    bbtkMessage("Help",level, "File Separator     : [" << file_separator  << "]" << std::endl);
+
+    std::vector<std::string>::const_iterator i;
+           
+    bbtkMessage("Help",level, "BBS Paths   " << std::endl);     
+    for (i = bbs_paths.begin(); i!=bbs_paths.end(); ++i )
+    {
+      bbtkMessage("Help",level,"--- ["<<*i<<"]"<<std::endl);
+    }    
+    
+    bbtkMessage("Help",level, "PACKAGE Paths : " << std::endl);     
+    for (i = package_paths.begin(); i!=package_paths.end(); ++i )
+    {
+      bbtkMessage("Help",level,"--- ["<<*i<<"]"<<std::endl);
+    }
+
+    bbtkDebugDecTab("Config",9);
+  }
+  //=========================================================================
+
 
 } // namespace bbtk