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

diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index eb2e31f..082f2a3 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/03/10 06:24:12 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2008/09/10 07:25:23 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -91,14 +91,18 @@ namespace bbtk
     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);
-	}
+    //
+    //-----------------------------------------------------------
+    // LG : REMOVE BUGGY PATH WITH include *:
+    // 
+    //    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
@@ -153,15 +157,7 @@ namespace bbtk
     // ==> 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
-//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);
-
+	configXmlFullPathName = Utilities::MakeUserSettingsFullFileName("bbtk_config.xml");
 	if (!Utilities::FileExists( configXmlFullPathName ))
 	  {         
 	    // ==> Nothing found, we create bbtk_config.xml in ".bbtk"