X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkFactory.cxx;h=9a6010bf19175e56278914e92d34e15a81d08715;hb=5e6e754f059d5fb6b25b883f89f76333228ba5c4;hp=0339fa70fe29982d4d54039f8b362e88c9e47050;hpb=ddbf713a6bf02c1d7fc75a370ec11f2b87cfe20d;p=bbtk.git

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index 0339fa7..9a6010b 100644
--- a/kernel/src/bbtkFactory.cxx
+++ b/kernel/src/bbtkFactory.cxx
@@ -4,8 +4,8 @@ Program:   bbtk
 Module:    $RCSfile: bbtkFactory.cxx,v $
 Language:  C++
 
-Date:      $Date: 2008/02/04 13:51:30 $
-Version:   $Revision: 1.10 $
+Date:      $Date: 2008/03/10 06:24:12 $
+Version:   $Revision: 1.29 $
                                                                                 
 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
@@ -37,20 +37,6 @@ PURPOSE.  See the above copyright notices for more information.
 
 #include <cctype>    // std::toupper
 
-// was in gdcm ...
-/*
-#ifdef _MSC_VER
-#   define getcwd _getcwd
-#endif
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-#   include <direct.h>
-#else
-#   include <unistd.h>
-#endif
-
-*/
-
 
 namespace bbtk
 {
@@ -61,8 +47,9 @@ namespace bbtk
   //===================================================================
   /// Default ctor
   Factory::Factory()
+    : mExecuter(0)
   {
-    bbtkDebugMessage("Core",7,"Factory::Factory()"<<std::endl);
+    bbtkDebugMessage("Kernel",7,"Factory::Factory()"<<std::endl);
   }
   //===================================================================
 
@@ -70,9 +57,9 @@ namespace bbtk
   /// Dtor
   Factory::~Factory()
   {
-    bbtkDebugMessageInc("Core",7,"Factory::~Factory()"<<std::endl);
+    bbtkDebugMessageInc("Kernel",7,"Factory::~Factory()"<<std::endl);
     CloseAllPackages();
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //===================================================================
 
@@ -80,174 +67,178 @@ namespace bbtk
   //===================================================================
   void Factory::CloseAllPackages()
   {
-    bbtkDebugMessageInc("Core",7,"Factory::CloseAllPackages()"<<std::endl);
+    bbtkDebugMessageInc("Kernel",7,"Factory::CloseAllPackages()"<<std::endl);
     while (mPackageMap.begin() != mPackageMap.end())
       {
         PackageMapType::iterator i = mPackageMap.begin();
         ClosePackage(i);
       }
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //===================================================================
 
   //===================================================================
   void Factory::Reset()
   {
-    bbtkDebugMessageInc("Core",7,"Factory::Reset()"<<std::endl);
+printf("EED kkkkkkkkkkkkkkkkkkkkkkkk  Factory::Reset() \n");
+printf("EED kkkkkkkkkkkkkkkkkkkkkkkk  Factory::Reset() \n");
+printf("EED kkkkkkkkkkkkkkkkkkkkkkkk  Factory::Reset() \n");
+printf("EED kkkkkkkkkkkkkkkkkkkkkkkk  Factory::Reset() \n");
+printf("EED kkkkkkkkkkkkkkkkkkkkkkkk  Factory::Reset() \n");
+printf("EED kkkkkkkkkkkkkkkkkkkkkkkk  Factory::Reset() \n");
+    bbtkDebugMessageInc("Kernel",7,"Factory::Reset()"<<std::endl);
     CloseAllPackages();
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //===================================================================
 
 
-// ===================================================================================
-
+  // ===================================================================
   bool Factory::DoLoadPackage(std::string libname,
                               std::string pkgname,
-                              std::string path,
-                              bool verbose)
+                              std::string path)
   {
-
+    
 #if defined(__GNUC__)
-
-        void *handler;
-        handler = dlopen(libname.c_str(),
-                                     BBTK_RTLD_TIME | BBTK_RTLD_SCOPE );
-        if (!handler)
-        {
-        // The following is *NOT* a debug time message :
-        // It's a user intended message.
-        // Please don't remove it.
-          if (verbose) {
-            std::cout <<"[" <<libname<<"] can't be open" << std::endl;
-            std::cout << "   " <<dlerror() << std::endl;
-          }
-          return false; // try next path
-        }
-
+    
+    void *handler;
+    handler = dlopen(libname.c_str(),
+		     BBTK_RTLD_TIME | BBTK_RTLD_SCOPE );
+    if (!handler)
+      {
         // The following is *NOT* a debug time message :
         // It's a user intended message.
         // Please don't remove it.
-        if (verbose)
-          std::cout <<"   -->[" <<libname<<"] found" << std::endl;
-
-      // Loads the Package accessor
-
-        std::string getpackname(pkgname);
-        getpackname += "GetPackage";
-        void *getpack = dlsym(handler, getpackname.c_str());
-        if (!getpack)
-        {
-          dlclose(handler);
-          bbtkError("GetPackage : could not load package \""<<pkgname
-                   <<"\" [symbol "<<getpackname<<"] :"<<dlerror());
-        }
-
-        // Verifies that the Package delete function is present
-        std::string delfname(pkgname);
-        delfname += "DeletePackage";
-        void *delf = dlsym(handler, delfname.c_str());
-        if (!delf)
-        {
-          dlclose(handler);
-          bbtkError("DeletePackage : could not load package \""<<pkgname
-                    <<"\" [symbol "<<delfname<<"] :"<<dlerror());
-        }
-
+	bbtkError("Could not open shared library [" <<libname<<"] : "
+		  <<dlerror() << std::endl);
+	
+	return false; // try next path
+      }
+    
+    // The following is *NOT* a debug time message :
+    // It's a user intended message.
+    // Please don't remove it.
+    bbtkMessage("Output",2,"   -->[" <<libname<<"] found" << std::endl);
+    
+    // Loads the Package accessor
+    
+    std::string getpackname(pkgname);
+    getpackname += "GetPackage";
+    void *getpack = dlsym(handler, getpackname.c_str());
+    if (!getpack)
+      {
+	dlclose(handler);
+	bbtkError("Shared library ["<<libname<<"] is not a valid bbtk package."
+		  <<" Symbol ["<<getpackname<<"] :"<<dlerror());
+      }
+    
+    // Verifies that the Package delete function is present
+    std::string delfname(pkgname);
+    delfname += "DeletePackage";
+    void *delf = dlsym(handler, delfname.c_str());
+    if (!delf)
+      {
+	dlclose(handler);
+	bbtkError("Shared library ["<<libname<<"] is not a valid bbtk package."
+		  <<" Symbol ["<<delfname<<"] :"<<dlerror());
+      }
+    
 #elif defined(_WIN32)
-
-        HINSTANCE handler;
-
-        SetErrorMode(0);
-        handler = LoadLibrary(libname.c_str());
-        if (!handler){
-          if (verbose)
-        // The following is *NOT* a debug time message :
-        // It's a user intended message.
-        // Please don't remove it.
-            std::cout <<"   no handler for [" <<libname<<"];" << std::endl;
-          return false;// Problem with the found library
-        }
-        if (verbose)
-          std::cout <<"   --->[" <<libname<<"] found" << std::endl;
-
+    
+    HINSTANCE handler;
+    
+    SetErrorMode(0);
+    handler = LoadLibrary(libname.c_str());
+    if (!handler)
+      {
+	// The following is *NOT* a debug time message :
+	// It's a user intended message.
+	// Please don't remove it.
+	bbtkError("Error loading library [" <<libname<<"]" << std::endl);
+	return false;// Problem with the found library
+      }
+    
+    bbtkMessage("Output",2,"   --->[" <<libname<<"] found" << std::endl);
+    
     // Loads the Package accessor
-
-        std::string getpackname(pkgname);
-        getpackname += "GetPackage";
-        void *getpack = GetProcAddress(handler, getpackname.c_str());
-        if (!getpack)
-        {
-          FreeLibrary(handler);
-          bbtkError("[1]could not load package \""<<pkgname
-          <<"\" : "<<getpackname<<" symbol not found (is it a bbtk package lib ?)");
-          // look how to get the error message on win
-              //<<dlerror());
-        }
-        // Verifies that the Package delete function is present
-        std::string delfname(pkgname);
-        delfname += "DeletePackage";
-        void *delf = GetProcAddress(handler, delfname.c_str());
-        if (!delf)
-        {
-          FreeLibrary(handler);
-          bbtkError("[2]could not load package \""<<pkgname
-                     <<"\" : "<<delfname<<" symbol not found (is it a bbtk package lib ?)");
-          // look how to get the error message on win
-          //<<dlerror());
-        }
+    
+    std::string getpackname(pkgname);
+    getpackname += "GetPackage";
+    void *getpack = GetProcAddress(handler, getpackname.c_str());
+    if (!getpack)
+      {
+	FreeLibrary(handler);
+	bbtkError("[1] Could not load package \""<<pkgname
+		  <<"\" : "<<getpackname<<" symbol not found (is it a bbtk package lib ?)");
+	// look how to get the error message on win
+	//<<dlerror());
+      }
+    // Verifies that the Package delete function is present
+    std::string delfname(pkgname);
+    delfname += "DeletePackage";
+    void *delf = GetProcAddress(handler, delfname.c_str());
+    if (!delf)
+      {
+	FreeLibrary(handler);
+	bbtkError("[2] Could not load package \""<<pkgname
+		  <<"\" : "<<delfname<<" symbol not found (is it a bbtk package lib ?)");
+	// look how to get the error message on win
+	//<<dlerror());
+      }
 #else
-        bbtkError("neither __GNUC__ nor _WIN32 ?!? How did you compile ?");
+    bbtkError("neither __GNUC__ nor _WIN32 ?!? How did you compile ?");
 #endif
-
+    
     // Stores the package
-        PackageInfoType pack;
-        pack.mDynamicLibraryHandler = handler;
+    PackageInfoType pack;
+    pack.mDynamicLibraryHandler = handler;
     // Invokes the accessor to the PackageUnit pointer
-        pack.mPackage = ((PackageAccessor)getpack)();
-
-        mPackageMap[pkgname] = pack;
-
+    pack.mPackage = ((PackageAccessor)getpack)();
+    
     // Test bbtk build version ok
-        if ( pack.mPackage->GetBBTKVersion() != bbtk::GetVersion() )
-        {
-          std::string v(pack.mPackage->GetBBTKVersion());
-          UnLoadPackage(pkgname);
-          bbtkError(" package build with bbtk version "
-                    << v
-                    << " whereas application build with version "
-                    << bbtk::GetVersion());
-        }
-
-        std::string separator =
-        ConfigurationFile::GetInstance().Get_file_separator ();
-        //BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH)
-        std::string docreldoc = separator + "packages" + separator + pkgname
-         + separator + "bbdoc" + separator + "index.html";
-        std::string reldoc = ".." + separator + ".." + separator
-         + ".." + docreldoc;
-        std::string doc = path + separator + ".." + separator
-         + BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH)
-         + docreldoc;
-
-        pack.mPackage->SetDocURL(doc);
-        pack.mPackage->SetDocRelativeURL(reldoc);
+    if ( pack.mPackage->GetBBTKVersion() != bbtk::GetVersion() )
+      {
+	std::string v(pack.mPackage->GetBBTKVersion());
+	UnLoadPackage(pkgname);
+	bbtkError("Cannot load package ["<<libname<<"]. "
+		  <<"Package build with bbtk version "
+		  << v
+		  << " whereas application build with version "
+		  << bbtk::GetVersion());
+      }
 
+    pack.mPackage->AddFactory(this);
+    mPackageMap[pkgname] = pack;
+    
+    std::string separator =
+      ConfigurationFile::GetInstance().Get_file_separator ();
+    //BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH)
+    std::string docreldoc = 
+      separator + "bbdoc" + separator + pkgname + separator + "index.html";
+    std::string reldoc = 
+      ".." + separator + ".." + docreldoc;
+    std::string doc = path + separator + ".." + separator
+      + BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH)
+      + docreldoc;
+    
+    pack.mPackage->SetDocURL(doc);
+    pack.mPackage->SetDocRelativeURL(reldoc);
+    
     //===================================================================
-        bbtkMessage("Output",2,pack.mPackage->GetName()<<" "
-           <<pack.mPackage->GetVersion()
-           <<" (bbtk "
-           <<pack.mPackage->GetBBTKVersion()<<") "
-           <<pack.mPackage->GetAuthor() << " Keyword(s) :"
-           <<pack.mPackage->GetKeyword()
-           <<std::endl);
-        bbtkMessage("Output",2,pack.mPackage->GetDescription()<<std::endl);
+    bbtkMessage("Output",2,pack.mPackage->GetName()<<" "
+		<<pack.mPackage->GetVersion()
+		<<" (bbtk "
+		<<pack.mPackage->GetBBTKVersion()<<") "
+		<<pack.mPackage->GetAuthor() << " Category(s) :"
+		<<pack.mPackage->GetCategory()
+		<<std::endl);
+    bbtkMessage("Output",2,pack.mPackage->GetDescription()<<std::endl);
     //===================================================================
-
-        bbtkDebugDecTab("Core",7);
-        return true;
+    
+    bbtkDebugDecTab("Kernel",7);
+    return true;
   }
-
+  
   //===================================================================
   /// \brief Loads a package.
   ///
@@ -258,14 +249,13 @@ namespace bbtk
   /// If it succeeds, then tries to load the symbols "<name>GetPackage" and "<name>DeletePackage".
   /// "<name>GetPackage" is called to get the pointer on the bbtk::Package of the library
   /// ("<name>DeletePackage" is not used, its presence is just checked before loading the package).
-
+  
   /// now, filename is only the last name (no longer the full name!)
   /// it will be searched within *all* the paths given in bbtk_config.xml
+  
 
-  /// verbose = true (set by "config v") displays the loading process
-
-  void Factory::LoadPackage( const std::string& name,
-                             bool use_configuration_file, bool verbose)
+  
+  void Factory::LoadPackage( const std::string& name )
   {
   // Note : in the following :
   // name : the user supplied name
@@ -276,10 +266,8 @@ namespace bbtk
   //
   // lastname : string before the last / (if any), or user supplied name
 
-    bbtkDebugMessageInc("Core",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
+    bbtkDebugMessageInc("Kernel",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
     bbtkMessage("Debug",1,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
-    bbtkMessage("Debug",1,"use_configuration_file ["
-                 << use_configuration_file << "]" << std::endl);
 
     std::vector<std::string> package_paths;
     std::string libname;  // full path library name
@@ -322,8 +310,8 @@ namespace bbtk
           return;
        }
 
-      // std::string path = Utilities::ExpandLibName(upath, verbose);
-       std::string path = Utilities::ExpandLibName(name, verbose); // keep last item, here.
+      // std::string path = Utilities::ExpandLibName(upath, false);
+       std::string path = Utilities::ExpandLibName(name,false); // keep last item, here.
          
        if (path != "")
        {
@@ -337,12 +325,12 @@ namespace bbtk
           // The following is *NOT* a debug time message :
           // It's a user intended message.
           // Please don't remove it.
-             if (verbose)
-                std::cout <<"   [" <<libname <<"] : doesn't exist" <<std::endl;
+	    bbtkMessage("Output",3,"   [" <<libname 
+			<<"] : doesn't exist" <<std::endl);
           }
           else
           {
-             ok = DoLoadPackage( libname, pkgname, path, verbose);         
+             ok = DoLoadPackage( libname, pkgname, path);         
           }
        }
        else
@@ -381,15 +369,15 @@ namespace bbtk
         // The following is *NOT* a debug time message :
         // It's a user intended message.
         // Please don't remove it.
-           if (verbose)
-              std::cout <<"   [" <<libname <<"] : doesn't exist" <<std::endl;
+          bbtkMessage("Output",3,
+		      "   [" <<libname <<"] : doesn't exist" <<std::endl);
            continue;  // try next path
         }
         foundFile = true; 
 
       // Try to Load the library
 
-        ok = DoLoadPackage( libname, pkgname, path, verbose);
+        ok = DoLoadPackage( libname, pkgname, path);
         if (ok)
         {
            bbtkMessage("Debug",2,"   OK"<<std::endl);
@@ -403,15 +391,15 @@ namespace bbtk
     {
       if (!foundFile)
       {
-        bbtkError("could not find package ["<<pkgname<< "]");
+        bbtkError("Could not find package ["<<pkgname<< "]");
       }
       else
       {
 #if defined(__GNUC__)
-        bbtkError("could not load package ["<< pkgname
+        bbtkError("Could not load package ["<< pkgname
                   <<"] :" << std::endl << "   " << dlerror());
 #elif defined(_WIN32)
-        bbtkError("could not load package ["<<pkgname
+        bbtkError("Could not load package ["<<pkgname
                  <<"] : " << std::endl << "   " <<libname<<" not found");
 
     // look how to get the error message on win
@@ -432,7 +420,7 @@ namespace bbtk
   /// If the entry is found in the map, calls ClosePackage
  void Factory::UnLoadPackage( const std::string& name )
  {
-    bbtkDebugMessageInc("Core",7,"Factory::UnLoadPackage(\""
+    bbtkDebugMessageInc("Kernel",7,"Factory::UnLoadPackage(\""
                        <<name<<"\")"<<std::endl);
   
     PackageMapType::iterator i;
@@ -443,85 +431,99 @@ namespace bbtk
                 <<"\" : package not loaded !");
     }
     ClosePackage(i);
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //===================================================================
 
 
   //===================================================================
   /// \brief Close the package referenced by the iterator 
-  ///
-  /// If it is a dynamically loaded package 
-  /// - Loads and calls the function "<name>DeletePackage" of the dynamic library (responsible for package desallocation)
-  /// - Closes the dynamic library
-  /// - Erases the package entry in the packages map
-  ///
-  /// Else simply erases the package entry in the packages map
-  void Factory::ClosePackage(PackageMapType::iterator& i) 
+ ///
+ /// First removes the factory from the set of factories which use the package
+ /// If the set is empty then :
+ /// If it is a dynamically loaded package :
+ /// - Loads and calls the function "<name>DeletePackage" of the dynamic library (responsible for package desallocation)
+ /// - Closes the dynamic library
+ /// Else :
+ /// - deletes the package normally
+ /// 
+ /// Finally erases the package entry in the packages map
+ void Factory::ClosePackage(PackageMapType::iterator& i) 
   {   
-     bbtkDebugMessageInc("Core",7,"Factory::ClosePackage(\""
+     bbtkDebugMessageInc("Kernel",7,"Factory::ClosePackage(\""
                          <<i->second.mPackage->GetName()
                         <<"\")"<<std::endl);
 
-     if (i->second.mDynamicLibraryHandler) 
-     {
- 
-      // If it is a dynamically loaded package
-      // Loads the Package delete function
-
-        std::string delfname(i->second.mPackage->GetName());
-        delfname += "DeletePackage";
+     
+     // Removes this from the set of factories which use the package
+     i->second.mPackage->RemoveFactory(this);
+     
+     // If no more factory which use it 
+     if (i->second.mPackage->GetFactorySet().empty())
+       {
+	 // If it is a dynamically loaded package	
+	 if (i->second.mDynamicLibraryHandler) 
+	   {
+	     
+	     
+	     // Loads the Package delete function
+	     
+	     std::string delfname(i->second.mPackage->GetName());
+	     delfname += "DeletePackage";
 #if defined(__GNUC__)     
-        void *delf = dlsym(i->second.mDynamicLibraryHandler, delfname.c_str());
-        if (!delf)
-        {
-           bbtkError("could not close package \""
-                     <<i->second.mPackage->GetName()
-                     <<"\" :"<<dlerror());
-        }    
+	     void *delf = dlsym(i->second.mDynamicLibraryHandler, delfname.c_str());
+	     if (!delf)
+	       {
+		 bbtkError("could not close package \""
+			   <<i->second.mPackage->GetName()
+			   <<"\" :"<<dlerror());
+	       }    
 #elif defined(_WIN32)
-   void *delf = GetProcAddress(i->second.mDynamicLibraryHandler, 
-                                 delfname.c_str());
-     if (!delf)
-     {  
-       bbtkError("could not close package \""
-                <<i->second.mPackage->GetName()
-                <<"\" : "<<delfname
-                <<" symbol not found (how did you open it ???");
-               //<<"\" :"<<dlerror());
-     }    
+	     void *delf = GetProcAddress(i->second.mDynamicLibraryHandler, 
+					 delfname.c_str());
+	     if (!delf)
+	       {  
+		 bbtkError("could not close package \""
+			   <<i->second.mPackage->GetName()
+			   <<"\" : "<<delfname
+			   <<" symbol not found (how did you open it ???");
+		 //<<"\" :"<<dlerror());
+	       }    
 #endif     
-
-   // deletes the package
-   ((PackageDeleteFunction)delf)();
-
-   // closes the dl handler
+	     
+	     // deletes the package
+	     ((PackageDeleteFunction)delf)();
+	     
+	     // closes the dl handler
 #if defined(__GNUC__)  
-    dlclose(i->second.mDynamicLibraryHandler);  
+	     dlclose(i->second.mDynamicLibraryHandler);  
 #elif defined(_WIN32)
-
-    FreeLibrary(i->second.mDynamicLibraryHandler);
+	     
+	     FreeLibrary(i->second.mDynamicLibraryHandler);
 #endif
-    }
-    else 
-    {  
-       // If it is a manually inserted package 
-       delete i->second.mPackage;
-    }
+	   }
 
-    // remove the entry in the map
-    mPackageMap.erase(i);
-    bbtkDebugDecTab("Core",7);
- }
-  //===================================================================
+	 else 
+	   {  
+	     // If it is a manually inserted package : delete it normally
+	     delete i->second.mPackage;
+	   }
+       }
+     
+     // in any cases remove the entry in the map
+     mPackageMap.erase(i);
 
+     bbtkDebugDecTab("Kernel",7);
+  }
+  //===================================================================
+  
 
 
   //===================================================================  
   /// Displays the list of packages loaded
   void Factory::PrintPackages(bool details, bool adaptors) const
   {
-    bbtkDebugMessageInc("Core",9,"Factory::PrintPackages"<<std::endl);
+    bbtkDebugMessageInc("Kernel",9,"Factory::PrintPackages"<<std::endl);
 
     PackageMapType::const_iterator i;
     for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
@@ -532,7 +534,7 @@ namespace bbtk
       }
     }
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //===================================================================
 
@@ -540,7 +542,7 @@ namespace bbtk
   /// Displays help on a package
   void Factory::HelpPackage(const std::string& name, bool adaptors) const
   {
-    bbtkDebugMessageInc("Core",9,"Factory::HelpPackage(\""<<name<<"\")"
+    bbtkDebugMessageInc("Kernel",9,"Factory::HelpPackage(\""<<name<<"\")"
                         <<std::endl);
 
     PackageMapType::const_iterator i = mPackageMap.find(name);
@@ -554,8 +556,8 @@ namespace bbtk
       if (i->second.mPackage->GetAuthor().length()>0)
         bbtkMessageCont("Help",1,"- "<<i->second.mPackage->GetAuthor());
         
-      if (i->second.mPackage->GetKeyword().length()>0)
-        bbtkMessageCont("Help",1,"- "<<i->second.mPackage->GetKeyword());        
+      if (i->second.mPackage->GetCategory().length()>0)
+        bbtkMessageCont("Help",1,"- "<<i->second.mPackage->GetCategory());        
         
       bbtkMessageCont("Help",1,std::endl);
       bbtkIncTab("Help",1);
@@ -573,19 +575,22 @@ namespace bbtk
       }
     else 
       {
-      bbtkDebugDecTab("Core",9);
+      bbtkDebugDecTab("Kernel",9);
       bbtkError("package \""<<name<<"\" unknown");
       }
     
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //===================================================================
 
   //===================================================================
   /// Prints help on the black box of type <name>
-  void Factory::HelpBlackBox(const std::string& name, bool full) const
+  /// Returns the package to which it belongs
+  void Factory::HelpBlackBox(const std::string& name, 
+			     std::string& package,
+			     bool full) const
   {
-    bbtkDebugMessageInc("Core",9,"Factory::HelpBlackBox(\""<<name<<"\")"
+    bbtkDebugMessageInc("Kernel",9,"Factory::HelpBlackBox(\""<<name<<"\")"
                         <<std::endl);
 
     bool found = false;
@@ -595,11 +600,12 @@ namespace bbtk
       if (i->second.mPackage->ContainsBlackBox(name)) 
         {
           i->second.mPackage->HelpBlackBox(name,full);
+	      package = i->second.mPackage->GetName();
           found = true;
         }
       }
     
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
     if (!found) 
       {
       bbtkError("No package of the factory contains any black box <"
@@ -613,16 +619,16 @@ namespace bbtk
   /// Inserts a package in the factory
   void Factory::InsertPackage( Package* p )
   {
-    bbtkDebugMessageInc("Core",9,"Factory::InsertPackage(\""<<
+    bbtkDebugMessageInc("Kernel",9,"Factory::InsertPackage(\""<<
                         p->GetName()<<"\")"<<std::endl);
 
+    p->AddFactory(this);
     PackageInfoType pack;
     pack.mDynamicLibraryHandler = 0;
-    
     pack.mPackage = p;
-
     mPackageMap[p->GetName()] = pack;
-    bbtkDebugDecTab("Core",9);
+
+    bbtkDebugDecTab("Kernel",9);
   }
   //===================================================================
   
@@ -630,7 +636,7 @@ namespace bbtk
   /// Removes a package from the factory (and deletes it)
   void Factory::RemovePackage( Package* p )
   {
-    bbtkDebugMessageInc("Core",9,"Factory::RemovePackage(\""<<
+    bbtkDebugMessageInc("Kernel",9,"Factory::RemovePackage(\""<<
                         p->GetName()<<"\")"<<std::endl);
 
     PackageMapType::iterator i;
@@ -641,15 +647,15 @@ namespace bbtk
     
     if (i!=mPackageMap.end())
       {
-      ClosePackage(i);
+	ClosePackage(i);
       }
     else 
       {
-      bbtkError("Factory::RemovePackage(\""<<
-                 p->GetName()<<"\") : package absent from factory");
+	bbtkError("Factory::RemovePackage(\""<<
+		  p->GetName()<<"\") : package absent from factory");
       }
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //===================================================================
   
@@ -659,7 +665,7 @@ namespace bbtk
   BlackBox* Factory::NewBlackBox(const std::string& type, 
                                  const std::string& name) const
   {
-    bbtkDebugMessageInc("Core",7,"Factory::NewBlackBox(\""
+    bbtkDebugMessageInc("Kernel",7,"Factory::NewBlackBox(\""
                         <<type<<"\",\""<<name<<"\")"<<std::endl);
 
     BlackBox* b = 0; 
@@ -674,7 +680,7 @@ namespace bbtk
        bbtkError("black box type \""<<type<<"\" unknown");
       } 
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
     return b;
   }
   //===================================================================
@@ -685,7 +691,7 @@ namespace bbtk
                      TypeInfo typeout,
                      const std::string& name) const
   {
-    bbtkDebugMessageInc("Core",8,"Factory::NewAdaptor(<"
+    bbtkDebugMessageInc("Kernel",8,"Factory::NewAdaptor(<"
                         <<TypeName(typein)<<">,<"
                         <<TypeName(typeout)<<">,\""
                         <<name<<"\")"<<bbtkendl);
@@ -706,7 +712,7 @@ namespace bbtk
           <<"> adaptor available");
       } 
     
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
     return b; 
   }
   //===================================================================
@@ -718,58 +724,12 @@ namespace bbtk
                                      BlackBox* to,
                                      const std::string& input) const
   {
-    bbtkDebugMessage("Core",7,"Factory::NewConnection(\""
+    bbtkDebugMessage("Kernel",7,"Factory::NewConnection(\""
                       <<from->bbGetName()<<"\",\""<<output<<"\",\""
                       <<to->bbGetName()<<"\",\""<<input
                       <<"\")"<<std::endl);
     
-    return new Connection(from,output,to,input);
-    /*  
-       Connection* c;
-    // !!! WARNING : WE NEED TO TEST THE TYPE NAME EQUALITY 
-    // BECAUSE IN DIFFERENT DYN LIBS THE type_info EQUALITY CAN 
-    // BE FALSE (DIFFERENT INSTANCES !)
-  
-    std::string t1 ( from->bbGetOutputType(output).name() );
-    std::string t2 ( to->bbGetInputType(input).name() );
-
-
-    if ( t1 == t2 ) 
-       //from->bbGetOutputType(output) ==
-       // to->bbGetInputType(input) )
-      {
-         c = new Connection(from,output,to,input);
-      }
-    else 
-      {
-         //   std::cout << "Adaptive connection "<<std::endl;
-         std::string name;
-         name = from->bbGetName() + "." + output + "-" 
-                                  + to->bbGetName() + "." + input; 
-
-         BlackBox* b = 0; 
-         PackageMapType::const_iterator i;
-         for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
-         {
-             b = i->second.mPackage->NewAdaptor(from->bbGetOutputType(output),
-                                                  to->bbGetInputType(input),
-                                                  name);
-             if (b) break; 
-         } 
-         if (!b)  
-         {  
-            bbtkError("did not find any <"
-                       <<TypeName(from->bbGetOutputType(output))
-                       <<"> to <"
-                       <<TypeName(to->bbGetInputType(input))
-                       <<"> adaptor");
-         } 
-         c = new AdaptiveConnection(from,output,to,input,b);
-      }
-      bbtkDebugDecTab("Core",7);
-    
-      return c;
-    */
+    return new Connection(from,output,to,input,this);
   }
   //===================================================================
 
@@ -778,51 +738,52 @@ namespace bbtk
   //===================================================================
   const Package* Factory::GetPackage(const std::string& name) const
   {
-    bbtkDebugMessageInc("Core",9,"Factory::GetPackage(\""<<name<<"\")"
+    bbtkDebugMessageInc("Kernel",9,"Factory::GetPackage(\""<<name<<"\")"
                          <<std::endl);
 
     PackageMapType::const_iterator i = mPackageMap.find(name);
     if ( i != mPackageMap.end() ) 
     {
-      bbtkDebugDecTab("Core",9); 
+      bbtkDebugDecTab("Kernel",9); 
       return i->second.mPackage;
     }
     else 
     {
-       bbtkDebugDecTab("Core",9);
+       bbtkDebugDecTab("Kernel",9);
        bbtkError("package \""<<name<<"\" unknown");
     }
     
-    bbtkDebugDecTab("Core",9);  
+    bbtkDebugDecTab("Kernel",9);  
   }
   //===================================================================
   
   //===================================================================
   Package* Factory::GetPackage(const std::string& name) 
   {
-    bbtkDebugMessageInc("Core",9,"Factory::GetPackage(\""<<name<<"\")"
+    bbtkDebugMessageInc("Kernel",9,"Factory::GetPackage(\""<<name<<"\")"
                          <<std::endl);
 
     PackageMapType::const_iterator i = mPackageMap.find(name);
     if ( i != mPackageMap.end() ) 
     {
-      bbtkDebugDecTab("Core",9); 
+      bbtkDebugDecTab("Kernel",9); 
       return i->second.mPackage;
     }
     else 
     {
-       bbtkDebugDecTab("Core",9);
+       bbtkDebugDecTab("Kernel",9);
        bbtkError("package \""<<name<<"\" unknown");
     }
     
-    bbtkDebugDecTab("Core",9);  
+    bbtkDebugDecTab("Kernel",9);  
   }
   //===================================================================
 
   //===================================================================
   void Factory::WriteDotFilePackagesList(FILE *ff)
   {
-    bbtkDebugMessageInc("Core",9,"Factory::WriteDotFilePackagesList()"
+
+    bbtkDebugMessageInc("Kernel",9,"Factory::WriteDotFilePackagesList()"
                          <<std::endl);
 
     fprintf( ff , "\n");
@@ -840,13 +801,14 @@ namespace bbtk
        fprintf(ff,"  %s [shape=ellipse, URL=\"%s\"]%s\n",i->first.c_str(),url.c_str(),";" );
     }
     fprintf( ff , "}\n\n");
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //===================================================================
 
 
  void Factory::ShowGraphTypes(const std::string& name) const
  {
+
    bool found = false;
    PackageMapType::const_iterator i;
    for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
@@ -855,10 +817,10 @@ namespace bbtk
       {
          std::string separator = ConfigurationFile::GetInstance().Get_file_separator ();
 
-            // Don't pollute the file store with  "doc_tmp" directories ...    
-         std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_doc_tmp();
-         std::string directory = "\"" + default_doc_dir + separator + "doc_tmp"  +separator + "\"";
-         std::string filename2 =  default_doc_dir + separator + "doc_tmp" + separator + "tmp.html"; 
+            // Don't pollute the file store with  "temp_dir" directories ...    
+         std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_temp_dir();
+         std::string directory = "\"" + default_doc_dir + separator + "temp_dir"  +separator + "\"";
+         std::string filename2 =  default_doc_dir + separator + "temp_dir" + separator + "tmp.html"; 
 
 #if defined(_WIN32)  
         std::string command("start \"Titre\" /D ");
@@ -881,7 +843,7 @@ namespace bbtk
      }
    }
     
-   bbtkDebugDecTab("Core",9);
+   bbtkDebugDecTab("Kernel",9);
    if (!found) 
    {
       bbtkError("No package of the factory contains any black box <"
@@ -895,7 +857,7 @@ namespace bbtk
   void Factory::CreateHtmlIndex(IndexEntryType type, 
 				const std::string& filename)
   {
-    bbtkDebugMessageInc("Core",9,"Factory::CreateHtmlIndex(\""
+    bbtkDebugMessageInc("Kernel",9,"Factory::CreateHtmlIndex(\""
 			<<filename<<"\")"<<bbtkendl);
     
     std::string title;
@@ -914,33 +876,42 @@ namespace bbtk
 	     ++j)
 	  {
 	    
+	    // Skip adaptors 
+	    if ( type==Adaptors )
+	      {  
+		if (j->second->GetKind() == BlackBoxDescriptor::STANDARD )
+		  continue;
+	      }
+	    else 
+	      if (j->second->GetKind() != BlackBoxDescriptor::STANDARD )
+		continue;
+
 	    std::vector<std::string> keys;
 	    if (type==Packages)
 	      {
-		keys.push_back(pack->GetName());
-		title = "Index by packages";
+		std::string k("");
+		k += pack->GetName();
+		keys.push_back(k);
+		title = "Boxes by package";
 	      }
-	    else if (type==Initials)
+	    else if ((type==Initials) || (type==Adaptors))
 	      {
 		std::string init(" ");
 		init[0] =  std::toupper(j->second->GetTypeName()[0]);
 		keys.push_back(init);
-		title = "Alphabetical index";
+		title = "Alphabetical list";
 	      }
-	    else if (type==Keywords)
+	    else if (type==Categories)
 	      {
-		// Split the keyword string 
-		//std::vector<std::string> keywords;
+		// Split the category string 
 		std::string delimiters = ";,";
-		Utilities::SplitString(j->second->GetKeyword(),
+		Utilities::SplitString(j->second->GetCategory(),
 				       delimiters,keys);
-		//std::vector<std::string>::iterator si;
-		//for (si=keywords.begin();si!=keywords.end;++si)
-		//  {
-		//    keys.push_back(*si);
-		//  }
-		title = "Index by keywords";
+		if (keys.size()==0) 
+		  keys.push_back(" NONE");
+		title = "Boxes by category";
 	      }
+    
 	    
 	    std::vector<std::string>::const_iterator k;
 	    for (k=keys.begin(); k!=keys.end(); ++k )
@@ -999,12 +970,35 @@ namespace bbtk
     //----------------------
     // Html body
     s << "<body>\n";
+    s << "<a name=\"Top\"></a>\n"; 
     s << "<h1 class=\"settitle\">"<<title<<"</h1>\n";
-
+    s << "<p>\n";
     IndexType::iterator ii;
     for (ii=index.begin();ii!=index.end();++ii)
       {
-	s << "<p><b>"<<ii->first<<"</b>\n";
+	s << "<a href=\"#"<<ii->first<<"\">"<<ii->first<<"</a>&nbsp;&nbsp;";	
+      }
+
+    for (ii=index.begin();ii!=index.end();++ii)
+      {
+	s << "<p><hr>\n";
+	s << "<p><a href=\"#Top\">Top</a>";
+	if (type==Packages)
+	  {
+	    s << "<a name=\""<<ii->first<<"\"></a>\n"; 
+	    s << "<p><a href=\""<<ii->first<<"/index.html\">"
+	      << ii->first<<"</a>\n"; 
+
+	    s << "&nbsp;&nbsp;-&nbsp;&nbsp;\n"; 
+
+	    s << "<a name=\"doxygen\"></a>\n"; 
+	    s << "<a href=..\\doxygen\\" << ii->first << "/main.html>(Doxygen documentation of the source)</a>\n"; 
+	  }
+	else 
+	  {
+	    s << "<a name=\""<<ii->first<<"\"></a>\n"; 
+	    s << "<p><b>"<<ii->first<<"</b>\n";
+	  }
 	s << "<ul>\n";
 
 	s << "<p><TABLE cellspacing=0  cellpadding=3>\n";
@@ -1014,10 +1008,12 @@ namespace bbtk
 	  {
 	    std::string pack = (*di)->GetPackage()->GetName();
 	    std::string name = (*di)->GetTypeName();
+	    Utilities::html_format(name);
 	    std::string descr = (*di)->GetDescription();
+	    Utilities::html_format(descr);
 	    s << "<TR>";
 	    s << "<TD style='vertical-align: top;'>";
-	    s << "<li><a href=\""<<pack
+	    s << "&nbsp;&nbsp;&nbsp;<a href=\""<<pack
 	      <<"/index.html#"<<name<<"\">"
 	      <<pack<<"::"<<name<<"</a>";
 	    s << "</TD> ";
@@ -1025,7 +1021,7 @@ namespace bbtk
 	    s << "</TR>\n";
 	  }    
 	s << "</TABLE>\n";
-	s << "</li></ul>\n";
+	s << "</ul>\n";
 	s << "</div>\n";
       }
     //----------------------
@@ -1044,7 +1040,7 @@ namespace bbtk
     //----------------------
 
     // End
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }