X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=39eb9ce948a2b55632a69945b8677661df6f5c22;hb=f0d396e8c3585edca83571ed0eeacef1b72828f1;hp=28dbfe43798c7b94b7c46668c8df21f3035bdc79;hpb=97d3e37bb950037df11ff1f40a43b2328ce460ee;p=bbtk.git

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index 28dbfe4..39eb9ce 100644
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
   Language:  C++
-  Date:      $Date: 2008/03/03 14:55:55 $
-  Version:   $Revision: 1.39 $
+  Date:      $Date: 2008/03/20 11:04:57 $
+  Version:   $Revision: 1.49 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,7 +23,6 @@
 #include "bbtkInterpreter.h"
 #include "bbtkMessageManager.h"
 #include "bbtkConfigurationFile.h"
-#include "bbtkWxConsole.h"
 #include "bbtkUtilities.h"
 #include <sys/stat.h>
 #include <algorithm>
@@ -37,7 +36,7 @@
 namespace bbtk
 {
 
-Interpreter* Interpreter::mGlobalInterpreter = NULL;
+  //Interpreter* Interpreter::mGlobalInterpreter = NULL;
 
  //=======================================================================
  /**
@@ -45,15 +44,16 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
    */
   Interpreter::Interpreter() 
     :
+    mUser(0),
     mCommandLine(false)
   {
+bufferNb =0;  
     bbtk::MessageManager::RegisterMessageType("Echo","Level>0 : Prints the 'echo' commands of the user.\n\tLevel>1 : Prints the command being interpreted",1);
     bbtk::MessageManager::RegisterMessageType("Interpreter","Messages of the interpreter",0);
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::Interpreter()" <<std::endl);
  
-    mGlobalInterpreter = this;
-
     mExecuter = new bbtk::Executer();
+    mExecuter->SetInterpreter(this);
     
     // For the time being, comment out previous line, and
     // uncomment next line to check Transcriptor
@@ -176,7 +176,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     info.help = "Creates an html index of known boxes. If filename is provided then save it to the file 'filename'. The default index entries are the initial letters of the names of the boxes. If 'Packages' or 'Categories' is provided then the entries are either the packages names or the categories. If 'Adaptors' is provided then an alphabetical index of all adaptors is created.";
     mCommandDict[info.category] = info;
 
-    info.category = "reset";  //EED
+    info.category = "reset";  
     info.argmin = 0;
     info.argmax = 0;
     info.code = cReset;
@@ -287,11 +287,8 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
    */
   Interpreter::~Interpreter()
   {
-
-std::cout << "=========================================~Interpreter()" << std::endl;
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::~Interpreter()" <<std::endl);
     delete mExecuter;
-    //delete mFactory;
 
     bbtkDebugDecTab("Interpreter",9);
   }
@@ -302,41 +299,42 @@ std::cout << "=========================================~Interpreter()" << std::e
   /**
    *  
    */
-  void Interpreter::InterpretFile( const std::string& filename )
+  Interpreter::ExitStatus Interpreter::InterpretFile( const std::string& filename )
   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
 
     bool exm = mCommandLine;
     mCommandLine = false;
 
+    ExitStatus status = OK;
+
     try 
     {
       SwitchToFile(filename);
+
       bool insideComment = false; // for multiline comment
       while (mFile.size()>0) 
       {
-         while ((mFile.size()>0) && 
-                (!mFile.back()->eof()))
-         {
-            mLine.back()++;
-            char buf[500];
-            mFile.back()->getline(buf,500);
-      
-            std::string str(buf);
-            int size=str.length();
-            if ( str[ size-1 ]==13  )
+	while (!mFile.back()->eof()) {
+	  mLine.back()++;
+	  char buf[500];
+	  mFile.back()->getline(buf,500);
+	  std::string str(buf);
+	  int size=str.length();
+	  if ( str[ size-1 ]==13  )
             {
-               str.erase(size-1,1);
+	      str.erase(size-1,1);
             }
-      
-            InterpretLine(str, insideComment);
-         }
-        //if (mFile.size()>0) 
-        CloseCurrentFile();
+	  
+	  InterpretLine(str, insideComment);
+	  
+       }//while
+       CloseCurrentFile();
       }
     }
     catch (QuitException e) 
     {
+      status = QUIT;
     }
     catch (bbtk::Exception e) 
     {
@@ -345,6 +343,7 @@ std::cout << "=========================================~Interpreter()" << std::e
          std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
          std::cerr << "* LINE  : "<<mLine.back()<<std::endl;
       }    
+      status = ERROR;
     }
     catch (std::exception& e) 
     {
@@ -352,15 +351,17 @@ std::cout << "=========================================~Interpreter()" << std::e
        if (mFileName.size()) {
           std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
           std::cerr << "* LINE  : "<<mLine.back()<<std::endl;
-       }    
+       }  
+      status = ERROR;
     }  
     catch (...)
     {
-       std::cout << "* UNDEFINED ERROR (not a bbtk nor a std exception)"<<std::endl;
+       std::cerr << "* UNDEFINED ERROR (not a bbtk nor a std exception)"<<std::endl;
        if (mFileName.size()) {
-          std::cout << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
-          std::cout << "* LINE  : "<<mLine.back()<<std::endl;
+          std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
+          std::cerr << "* LINE  : "<<mLine.back()<<std::endl;
       }    
+       status = ERROR;
     }
 
     CloseAllFiles();
@@ -368,10 +369,138 @@ std::cout << "=========================================~Interpreter()" << std::e
     bbtkDecTab("Interpreter",9);
 
     mCommandLine = exm;
+    
+    return status;
   }
   //=======================================================================
 
 
+  //=======================================================================
+  /**
+   *  
+   */
+  Interpreter::ExitStatus 
+  Interpreter::InterpretBuffer( std::stringstream* buffer )
+  {
+    bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretBuffer()"<<std::endl);
+
+    bool exm = mCommandLine;
+    mCommandLine = false;
+
+    ExitStatus status = OK;
+
+    try 
+    {
+      SwitchToStream(buffer);
+      bool insideComment = false; // for multiline comment
+      while (mFile.size()>0) 
+      {
+	while (!mFile.back()->eof()) {
+	  mLine.back()++;
+	  char buf[500];
+	  mFile.back()->getline(buf,500);
+	  std::string str(buf);
+	  
+	  int size=str.length();
+	  if ( str[ size-1 ]==13  )
+            {
+	      str.erase(size-1,1);
+            }
+	  
+	  InterpretLine(str, insideComment);
+	  
+	}//while
+	
+	CloseCurrentFile();
+      }
+    }
+    catch (QuitException e) 
+      { 
+	status = QUIT;
+      }
+    catch (bbtk::Exception e) 
+      {
+	std::cerr << "* ERROR : "<<e.GetMessage()<<std::endl;
+	if (mFileName.size()) 
+	  {
+	    std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
+	    std::cerr << "* LINE  : "<<mLine.back()<<std::endl;
+	  }    
+	status = ERROR;
+      }
+    catch (std::exception& e) 
+      {
+	std::cerr << "* ERROR : "<<e.what()<<" (not in bbtk)"<<std::endl;
+	if (mFileName.size()) 
+	  {
+	    std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
+	    std::cerr << "* LINE  : "<<mLine.back()<<std::endl;
+	  }    
+	status = ERROR;
+    }  
+    catch (...)
+      {
+	std::cerr 
+	  << "* UNDEFINED ERROR (not a bbtk nor a std exception)"<<std::endl;
+	if (mFileName.size()) 
+	  {
+	    std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
+	    std::cerr << "* LINE  : "<<mLine.back()<<std::endl;
+	  }    
+	status = ERROR;
+      }
+    
+    CloseAllFiles();
+    bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretBuffer()"<<std::endl);
+    bbtkDecTab("Interpreter",9);
+    
+    mCommandLine = exm;
+    return status;
+  }
+  //=======================================================================
+
+  //=======================================================================
+  /// Runs the interpretation of a command
+  Interpreter::ExitStatus Interpreter::InterpretLine( const std::string& line )
+  {
+    bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretLine('"<<line<<"')"<<std::endl);
+
+    ExitStatus status = OK;
+
+    try 
+    {
+      bool insideComment = false;
+      InterpretLine(line, insideComment);
+    }
+    catch (QuitException e) 
+      { 
+      status = QUIT;
+      }
+    catch (bbtk::Exception e) 
+      {
+	std::cerr << "* ERROR : "<<e.GetMessage()<<std::endl;
+	status = ERROR;
+      }
+    catch (std::exception& e) 
+      {
+	std::cerr << "* ERROR : "<<e.what()<<" (not in bbtk)"<<std::endl;
+	status = ERROR;
+    }  
+    catch (...)
+      {
+	std::cerr 
+	  << "* UNDEFINED ERROR (not a bbtk nor a std exception)"<<std::endl;
+	status = ERROR;
+      }
+    
+
+    bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretLine()"
+		     <<std::endl);
+    bbtkDecTab("Interpreter",9);
+    
+    return status;
+  }
+  
 
   //=======================================================================  
   /**
@@ -379,7 +508,6 @@ std::cout << "=========================================~Interpreter()" << std::e
    */
 void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
 {
-
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretLine(\""<<line<<"\")"<<std::endl);
     bbtkMessage("Echo",2,"\""<<line<<"\""<<std::endl);
 
@@ -557,7 +685,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
         Config();
         break;
 
-      case cReset :  // EED
+      case cReset :  
         this->mExecuter->Reset();
         break;
 
@@ -573,16 +701,16 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
 	// if 'source' was given
 	if (words.size()==3) 
 	  {
-	    this->mExecuter->SetCurrentFileName(words[1]);
+	    GetExecuter()->SetCurrentFileName(words[1]);
 	  }
         break;
 
       case cLoad:
-        LoadPackage(words[1]);
+        GetExecuter()->GetFactory()->LoadPackage(words[1]);
         break;
 
       case cUnload:
-        UnLoadPackage(words[1]);
+        GetExecuter()->GetFactory()->UnLoadPackage(words[1]);
         break;
 
       case cQuit :
@@ -660,10 +788,10 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     pos = s.find(ss,0);
     char* cr = "\n";
     while ( pos != std::string::npos )
-   {
+    {
       s.replace(pos,2,cr,1);
       pos = s.find(ss, pos-1);
-   }
+    }
   }
   //=======================================================================
 
@@ -772,13 +900,16 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     // It's a user intended message.
     // Please don't remove it.
     bbtkMessage("Interpreter",1,
-		"look for : [" << name
-		  << "]" << std::endl);
+        "look for : [" << name
+        << "]" << std::endl);
     script_paths = ConfigurationFile::GetInstance().Get_bbs_paths();
 
     std::string upath;
     pkgname = Utilities::ExtractScriptName(name,upath);
 
+    bbtkMessage("Interpreter",1,
+		"extract : pkgname [" << pkgname
+		 << "] upath [" << upath << "]" << std::endl);
     bool fullnameGiven = false; 
     bool foundFile     = false;
 
@@ -786,23 +917,34 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     {
       int nbBssFiles;
 
+      std::stringstream* stream = new std::stringstream;
+      //if (upath.size()!=0) // avoid troubles for "*"
+      
       if (upath[0]=='/' || upath[1] == ':' ) // ==== absolute name, load all .bbs files
       {
         int nbFiles = Utilities::Explore(upath, false, Filenames);
         nbBssFiles = 0;
         for (std::vector<std::string>::iterator i = Filenames.begin(); i!= Filenames.end(); ++i)
         {
-           if ((*i).substr((*i).size()-4, 4) != ".bbs")
-              continue;      // ignore non .bbs files
-           LoadScript(*i,name);
+           int lgr = (*i).size();
+	   if (lgr < 5)
+	      continue;  // ignore non .bbs file
+           if ((*i).substr(lgr-4, 4) != ".bbs")
+	      continue;
+
+          (*stream) << "include " << *i << "\n";
+
            nbBssFiles++;
-        }
-        if (nbBssFiles==0)
+        } // for vector
+		if (nbBssFiles==0){
            bbtkMessage("Interpreter",2,
 		       "WARNING : No '.bbs' file found in [" 
 		       << upath << "]" << std::endl);
+		} else {
+            SwitchToStream(stream);
+		}
         return;
-      }
+      }  // if upath
 
       std::string path;
       std::vector<std::string>::iterator i;
@@ -817,11 +959,10 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
           char * currentDir = getcwd(buf, 2048);
           std::string cwd(currentDir);
           path = currentDir;
-        }
+        } // if path
 
         fullDirectoryName = Utilities::MakePkgnameFromPath(path, upath, false);
 
-        //EED 18 Fev 2008
         // without last slash "\"
         std::string fullDirectoryNameClean = fullDirectoryName.substr(0,fullDirectoryName.size()-1);
 
@@ -831,35 +972,40 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         // The following is *NOT* a debug time message :
         // It's a user intended message.
         // Please don't remove it.
-	  bbtkMessage("Interpreter",1,"   [" <<fullDirectoryName 
+	      bbtkMessage("Interpreter",1,"   [" <<fullDirectoryName 
 		      <<"] : doesn't exist" <<std::endl);
           continue;  // try next path
-        }
+        } // if IsDirectory
         foundFile = true;
 
-
+        Filenames.clear();
         int nbFiles = Utilities::Explore(fullDirectoryName, false, Filenames);
 
         nbBssFiles = 0;
         for (std::vector<std::string>::iterator i = Filenames.begin(); i!= Filenames.end(); ++i)
         {
-           if ((*i).substr((*i).size()-4, 4) != ".bbs")
-              continue;      // ignore non .bbs files
-           LoadScript(*i,name);
+           int lgr = (*i).size();
+	   if (lgr < 5)
+	      continue;  // ignore non .bbs file
+           if ((*i).substr(lgr-4, 4) != ".bbs")
+	      continue;
+
+           (*stream) << "include " << *i << "\n";
            nbBssFiles++;
-        }
-        if (nbBssFiles==0)
-	  bbtkMessage("Interpreter",1,
+        } // for vector
+		if (nbBssFiles==0){
+           bbtkMessage("Interpreter",1,
 		      "WARNING : No '.bbs' file found in [" 
 		      << fullDirectoryName << "]" << std::endl);
+		} else {
+           SwitchToStream(stream);
+		}
 
         //break; // a directory was found; we stop iterating
 	// LG : No! We want all files included !
-       }
+       } // for vector
        return;
-    }
-
-    //std::string::size_type slash_position = name.find_last_of("/\\");
+    }  // if *
 
     // if name starts with a / or a . or contains : user is assumed to have passed a relative/absolute name
     // (not only a plain script name)
@@ -878,7 +1024,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
       int l = fullPathScriptName.size();
 
       if (l!=0) {
-      
+
       if (l>4)
       {
          if (fullPathScriptName.substr(l-4, 4) != ".bbs")
@@ -891,21 +1037,19 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
          fullPathScriptName = fullPathScriptName + ".bbs";   
       }
 
-        if ( Utilities::FileExists(fullPathScriptName))
-        {
-          foundFile = true;
-        }
-      } // endif l != 0
-    }
-    else 
-
-      // =============================================================== iterate on the paths
+      if ( Utilities::FileExists(fullPathScriptName))
       {
+        foundFile = true;
+      }
+    } // endif l != 0
+  }
+  else
+      // =============================================================== iterate on the paths
+  {
       std::string path;
       std::vector<std::string>::iterator i;
       for (i=script_paths.begin();i!=script_paths.end();++i)
       {
-
         path = *i;
        // we *really* want '.' to be the current working directory
         if (path == ".") {
@@ -915,10 +1059,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
           path = currentDir;
         }
 
-       // fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true); //pkgname);
-
-	    fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true);
-
+       fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true);
 
       // Check if library exists
         if ( ! Utilities::FileExists(fullPathScriptName) )
@@ -926,12 +1067,12 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         // The following is *NOT* a debug time message :
         // It's a user intended message.
         // Please don't remove it.
-	  bbtkMessage("Interpreter",2,
-		      "   [" <<fullPathScriptName <<"] : doesn't exist" 
-		      <<std::endl);
+           bbtkMessage("Interpreter",2,
+                       "   [" <<fullPathScriptName <<"] : doesn't exist" 
+                       <<std::endl);
           continue;  // try next path
         }
-	bbtkMessage("Interpreter",2,
+	    bbtkMessage("Interpreter",2,
 		    "   [" <<fullPathScriptName 
 		    <<"] : found" <<std::endl);
         foundFile = true;
@@ -958,23 +1099,51 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
   }
 
 
+void Interpreter::SwitchToStream( std::stringstream* stream )
+{
+    mFile.push_back(stream);
+    std::ostringstream buffer_name;
+    bufferNb++;
+    buffer_name << "buffer_" ;
+
+    if (mFileName.size()>0 )
+    {
+       buffer_name << mFileName.back() << "_" << mLine.back();
+    }
+    mFileName.push_back(buffer_name.str());
+    mIncludeFileName.push_back(buffer_name.str());
+    mLine.push_back(0);
+}
+
   //=======================================================================
 
   void Interpreter::LoadScript( std::string fullPathScriptName,
 				std::string includeScriptName)
   {
-    if (find(mFileName.begin(),mFileName.end(),fullPathScriptName)
-	!=mFileName.end()) 
-      {
-	bbtkMessage("Interpreter",1,"file '"<<fullPathScriptName
+     Utilities::replace( fullPathScriptName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+
+     bool okScriptExist=false;
+     int iStrScript,sizeVecStricpt=mFileName.size();
+     for ( iStrScript=0;iStrScript<sizeVecStricpt;iStrScript++)
+     {
+        if (mFileName[iStrScript] == fullPathScriptName )
+        {
+           okScriptExist=true;
+        } // if
+     } // for
+
+     if (find(mFileName.begin(),mFileName.end(),fullPathScriptName)!=mFileName.end())
+//    if (okScriptExist==true)
+     {
+	    bbtkMessage("Interpreter",1,"file '"<<fullPathScriptName
 		    <<"' already open : I do not open it once more to prevent recursive inclusion"<<std::endl);
-	return;
-      }
+        return;
+     }
 
     std::ifstream* s;
     s = new std::ifstream;
     s->open(fullPathScriptName.c_str());
-    if (!s->good()) 
+    if (!s->good())
     {
         bbtkError("Could not open file ["<<fullPathScriptName<<"]");
         return;
@@ -1005,15 +1174,17 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
       return;
     }
 
-    mFile.back()->close();
+    bbtkDebugMessage("Interpreter",9," Closing file '"<<mFileName.back()<<"'"<<std::endl);
+
+    std::ifstream* file = dynamic_cast<std::ifstream*>(mFile.back());
+    if (file!=0) file->close();
+
     delete mFile.back();
     mFile.pop_back();
-    bbtkDebugMessage("Interpreter",9,
-                     " Closing file '"<<mFileName.back()<<"'"<<std::endl);
-
     mFileName.pop_back();
     mIncludeFileName.pop_back();
     mLine.pop_back();
+
     bbtkDebugMessage("Interpreter",9," Remains "
                      <<mFile.size()
                      <<" open"<<std::endl);
@@ -1033,6 +1204,8 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
 
     while (mFile.size() != 0) 
     {
+       CloseCurrentFile();
+    /*
       mFile.back()->close();
       delete mFile.back();
       mFile.pop_back();
@@ -1041,6 +1214,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
       mFileName.pop_back();
       mIncludeFileName.pop_back();
       mLine.pop_back();
+*/
     }
     bbtkDebugMessage("Interpreter",9,"EO Interpreter::CloseAllFiles()"
                       <<std::endl);
@@ -1093,7 +1267,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
     {
       if (words[1]=="packages") 
       {
-         PrintPackages(true);
+         GetExecuter()->GetFactory()->PrintPackages(true);
          return;
       }
       try 
@@ -1104,51 +1278,47 @@ void Interpreter::Help(const std::vector<std::string>& words)
       {
          try 
          {
-            HelpPackage(words[1]);
-#ifdef _USE_WXWIDGETS_
-	    if ( WxConsole::GetInstance() != 0 )
+            GetExecuter()->GetFactory()->HelpPackage(words[1]);
+	    if ( mUser != 0 )
 	      {
 		std::string url = 
 		  ConfigurationFile::GetInstance().Get_doc_path();
 		url += "/bbdoc/" + words[1] + "/index.html";
 		if (Utilities::FileExists(url)) 
 		  {
-		    WxConsole::GetInstance()->ShowHtmlPage(url);
+		    mUser->InterpreterUserViewHtmlPage(url);
 		  }
 	      }
-#endif	    
          }
          catch (bbtk::Exception f) 
          {
-            try 
-            {
-	      std::string package;
-	      HelpBlackBox(words[1],package);
-#ifdef _USE_WXWIDGETS_
-	       if ( WxConsole::GetInstance() != 0 )
+	   try 
+	     {
+	       std::string package;
+	       GetExecuter()->GetFactory()->HelpBlackBox(words[1],package);
+	       if ( mUser != 0 )
 		 {
 		   std::string url = 
 		     ConfigurationFile::GetInstance().Get_doc_path();
 		   url += "/bbdoc/" + package + "/index.html";
-		   if (Utilities::FileExists(url))
+		   if (Utilities::FileExists(url)) 
 		     {
 		       url += "#" + words[1];
-		       WxConsole::GetInstance()->ShowHtmlPage(url);
+		       mUser->InterpreterUserViewHtmlPage(url);
 		     }
 		 }
-#endif
-	    }
-	    catch (bbtk::Exception g) 
-	      {
-		try
-		  {
-		    this->mExecuter->ShowRelations(words[1],"0","9999");
-		  }
-		catch (bbtk::Exception h){
-		  bbtkError("\""<<words[1].c_str()
-			    <<"\" is not a known command, package, black box type or black box name");
-		}
-	      }
+	     }
+	   catch (bbtk::Exception g) 
+	     {
+	       try
+		 {
+		   GetExecuter()->ShowRelations(words[1],"0","9999");
+		 }
+	       catch (bbtk::Exception h){
+		 bbtkError("\""<<words[1].c_str()
+			   <<"\" is not a known command, package, black box type or black box name");
+	       }
+	     }
          }
       }
     }
@@ -1158,12 +1328,12 @@ void Interpreter::Help(const std::vector<std::string>& words)
       {
          if ( words[1]=="packages" )
          {
-            PrintPackages(true,true);
+            GetExecuter()->GetFactory()->PrintPackages(true,true);
             return;
           }
          try 
          {
-            HelpPackage(words[1],true);
+            GetExecuter()->GetFactory()->HelpPackage(words[1],true);
          }
          catch (bbtk::Exception f) 
          {
@@ -1498,6 +1668,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
       }
       catch (QuitException e)
       {
+	bbtkMessage("Interpreter",1,"Interpreter : Quit"<<std::endl);
         again = false;
       }
       catch (bbtk::Exception e) 
@@ -1530,9 +1701,8 @@ void Interpreter::Graph(const std::vector<std::string>& words)
   std::string page;
     bool system_display = true;
 
-#ifdef _USE_WXWIDGETS_
-    if ( WxConsole::GetInstance() != 0 ) system_display = false; 
-#endif
+    if ( ( mUser != 0 ) && ( mUser->InterpreterUserHasOwnHtmlPageViewer() ) )
+      system_display = false; 
  
     if (words.size()==1) 
     {
@@ -1563,10 +1733,9 @@ void Interpreter::Graph(const std::vector<std::string>& words)
 	page = mExecuter->ShowGraph(words[1],words[2],words[3],words[4],words[5],words[6],system_display);
       } 
     
-#ifdef _USE_WXWIDGETS_
-    if ( WxConsole::GetInstance() != 0 )
-      WxConsole::GetInstance()->ShowHtmlPage(page);
-#endif
+    if ( ( mUser != 0 ) && ( mUser->InterpreterUserHasOwnHtmlPageViewer() ) )
+      mUser->InterpreterUserViewHtmlPage(page);
+
   }
 //=======================================================================
 
@@ -1581,7 +1750,7 @@ void  Interpreter::Index(const std::string& filename,
   else if (type=="Packages") t = Factory::Packages;
   else if (type=="Adaptors") t = Factory::Adaptors;
   
-  GetGlobalFactory()->CreateHtmlIndex(t,filename);
+  GetExecuter()->GetFactory()->CreateHtmlIndex(t,filename);
 }
 //=======================================================================