Merge branch 'wt-version'

[bbtk.git] / kernel / src / bbtkUtilities.cxx

diff --git a/kernel/src/bbtkUtilities.cxx b/kernel/src/bbtkUtilities.cxx
index 0a6fd9f0cee96db2acf7821da2be679edf2720d3..7e85dc76787497b9e350fc332188b4283f88304b 100644 (file)
--- a/kernel/src/bbtkUtilities.cxx
+++ b/kernel/src/bbtkUtilities.cxx
@@ -332,12 +332,8 @@ namespace bbtk
   /// Returns the user settings dir, e.g. /home/username/.bbtk
   std::string Utilities::GetUserSettingsDir()
   {
-#if defined(__GNUC__)
-    std::string str_home(getenv("HOME"));
-#elif defined(_WIN32)
-    std::string str_home(getenv("USERPROFILE"));
-#endif
-    std::string fullname = str_home + "/.bbtk";
+    std::string str_Home=Utilities::GetEnvHome();
+    std::string fullname = str_Home + "/.bbtk";
     MakeValidFileName(fullname);
     return fullname;
   }
@@ -348,11 +344,7 @@ namespace bbtk
   /// in user settings dir, e.g. /home/username/.bbtk/
   std::string Utilities::MakeUserSettingsFullFileName(const std::string& name)
   {
-#if defined(__GNUC__)
-    std::string str_home(getenv("HOME"));
-#elif defined(_WIN32)
-    std::string str_home(getenv("USERPROFILE"));
-#endif
+    std::string str_home=Utilities::GetEnvHome();
     std::string fullname = str_home + "/.bbtk/" + name;
     MakeValidFileName(fullname);
     return fullname;
@@ -767,6 +759,26 @@ namespace bbtk
   }
   //=========================================================================
 
+
+std::string Utilities::GetEnvHome()
+{
+#if defined(__GNUC__)
+       std::string strHome;
+    char *envHome=getenv("HOME");
+    if (envHome!=NULL)  
+       { 
+               strHome=envHome; 
+       } else {
+               strHome = "/var/www/testwtdbg/docroot";
+       } // if
+#elif defined(_WIN32)
+       std::string strHome( getenv("USERPROFILE") );
+#endif
+       return strHome;
+}   
+
+
+
 //TAD Arbol CFT
 
 
@@ -786,68 +798,39 @@ NodeTreeC::~NodeTreeC()
 {
 
 }
+void NodeTreeC::deleteTree()
+{
+       data = "";
+       std::cout<<"NodeTreeC::deleteTree 1"<<std::endl;
+       childs.erase(childs.begin(),childs.begin()+childs.size());
+       std::cout<<"NodeTreeC::deleteTree 2"<<std::endl;
+}
 
 void NodeTreeC::insertChild(std::string _data)
 {
        NodeTreeC temp = NodeTreeC(_data);
        childs.push_back(temp);
+       //std::cout<<"NodeTreeC::insertChild"<<std::endl;
 }
 
-void NodeTreeC::treeTour()
+void NodeTreeC::treeTour(int lvl)
 {
-       std::cout <<"data "<< data << std::endl;
-       std::cout <<"size "<< childs.size() << std::endl;
+       std::string space = "";
+       for (int j=0; j<lvl ; j++){
+                               space += "   ";
+       }
+       lvl++;
+       std::cout <<space<<"data: "<< data << "  size: "<< childs.size() << std::endl;
        for(int i = 0 ; i < childs.size(); i++)
        {
-               childs[i].treeTour();           
+               childs[i].treeTour(lvl);                
        }
 }
 
 void NodeTreeC::setData(std::string _data)
 {
        data = _data;
+       //std::cout<<"NodeTreeC::setData"<<std::endl;
 }
 
-
-//---------Tree------------
-/*
-TreeC::TreeC()
-{
-
-}
-
-TreeC::TreeC(std::string _data)
-{
-       root = NodeTreeC(_data);
-}
-
-TreeC::~TreeC()
-{
-
-}
-
-void TreeC::insertRoot(std::string _data)
-{
-       NodeTreeC temp = NodeTreeC(_data);
-       root = temp;
-}
-
-void TreeC::treeTour()
-{
-       root.treeTour();
-}
-
-void TreeC::insertData(std::string _data)
-{
-       
-}
-
-TreeC* TreeC::getSubTree()
-{
-       TreeC temp;
-       temp.root = root.childs[0];
-       return ;
-}
-*/
-
 }