X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkFactory.cxx;h=74d515ded67b1fb1106fe203631eac73c8eeba44;hb=5afbcf4593f1c4401ed7d5687dec068e89dfa8e7;hp=2accdca393e67717daa9060a1185a12e6e67bc6e;hpb=6990a8aeeaf98fc901ed193b95365b2eee2fb950;p=bbtk.git

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index 2accdca..74d515d 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/01/22 16:55:04 $
-Version:   $Revision: 1.2 $
+Date:      $Date: 2008/03/04 08:09:04 $
+Version:   $Revision: 1.26 $
                                                                                 
 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
@@ -35,6 +35,7 @@ PURPOSE.  See the above copyright notices for more information.
 #include <direct.h> // for getcwd
 #endif
 
+#include <cctype>    // std::toupper
 
 // was in gdcm ...
 /*
@@ -61,7 +62,7 @@ namespace bbtk
   /// Default ctor
   Factory::Factory()
   {
-    bbtkDebugMessage("Core",7,"Factory::Factory()"<<std::endl);
+    bbtkDebugMessage("Kernel",7,"Factory::Factory()"<<std::endl);
   }
   //===================================================================
 
@@ -69,9 +70,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);
   }
   //===================================================================
 
@@ -79,168 +80,172 @@ 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);
+    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 pkgname,
+                              std::string path)
   {
-
+    
 #if defined(__GNUC__)
-
-        void *handler;            
-        handler = dlopen(libname.c_str(), 
-                                     BBTK_RTLD_TIME | BBTK_RTLD_SCOPE );
-        if (!handler)
-        {
-          if (verbose) {
-            std::cout <<"[" <<libname<<"] can't be open" << std::endl;
-            std::cout << "   " <<dlerror() << std::endl;
-          }
-          return false; // try next path
-        }
-      
-        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());
-        } 
-
+    
+    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.
+	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)
-            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 ?");
-#endif   
-  
+    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)();
+    
+    mPackageMap[pkgname] = pack;
+    
     // 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;
-     
-	//std::cout << "doc='"<<doc<<"'"<<std::endl;
-	
-	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());
+      }
+    
+    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() 
-           <<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.
   ///
   /// The name is the system-independant name of the package (the name of the instance of bbtk::Package).
@@ -250,30 +255,30 @@ 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 
-  //      - abreviated name    e.g.       pkg   pkg.so   libbpkg   libbbpkg.so 
-  //      - relative full name e.g.       ./libbbpkg.so   ../../libbbpkg.so 
+  // name : the user supplied name
+  //      - abreviated name    e.g.       pkg   pkg.so   libbpkg   libbbpkg.so
+  //      - relative full name e.g.       ./libbbpkg.so   ../../libbbpkg.so
   //      - absolute full name e.g.       /home/usrname/proj/lib/libbbpkg.so
   //          same for Windows, with      c:, d: ...
   //
-    bbtkDebugMessageInc("Core",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);
-  
+  // lastname : string before the last / (if any), or user supplied name
+
+    bbtkDebugMessageInc("Kernel",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
+    bbtkMessage("Debug",1,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
+
     std::vector<std::string> package_paths;
     std::string libname;  // full path library name
     std::string pkgname;  // e.g. libbb<pkgname>.so
-    
+
     std::string upath;
     pkgname = Utilities::ExtractPackageName(name,upath);
 
@@ -283,47 +288,86 @@ namespace bbtk
     // no loading package if already loaded
     PackageMapType::iterator iUnload;
     iUnload = mPackageMap.find(pkgname);
-    if (iUnload != mPackageMap.end()) 
+    if (iUnload != mPackageMap.end())
     {
-      bbtkMessage("Output",2,"["<<pkgname<<"] already loaded"<<std::endl);
-      return; 
+      bbtkMessage("Output",2,"["<< pkgname <<"] already loaded" << std::endl);
+      return;
     }
-    
-   // If path provided by user will be the first scanned : 
-    // push it into vector of paths
-    if (upath.length()>0) package_paths.push_back(upath);
 
-    // Add the path of config file 
-    if (use_configuration_file)
+// =================================================
+// The following structure was checked to work
+// with any type of relative/absolute path.
+// Please don't modify it without checking
+// *all* the cases. JP
+//==================================================
+
+//std::cout << "upath [" << upath << "]" << std::endl;
+
+    bool ok = false;
+    bool foundFile = false;
+
+    // If path provided by user will be the first scanned :
+    // push it into vector of paths
+    if (upath.length()>0)   // ------------------------------------- check user supplied location
     {
-      std::vector<std::string>::const_iterator pi;
-      for (pi =ConfigurationFile::GetInstance().Get_package_paths().begin();
-	        pi!=ConfigurationFile::GetInstance().Get_package_paths().end();
-	      ++pi)
-	     package_paths.push_back(*pi);
+       if (name[0] != '.' && name[0] != '/' && name[1]!= ':')
+       {
+          bbtkError("Use absolute or relative path name! ["<<name<<"] is an illegal name");
+          return;
+       }
+
+      // std::string path = Utilities::ExpandLibName(upath, false);
+       std::string path = Utilities::ExpandLibName(name,false); // keep last item, here.
+         
+       if (path != "")
+       {
+          std::string p2;
+          Utilities::ExtractPackageName(path,p2);
+          //libname = Utilities::MakeLibnameFromPath(path, pkgname);
+          libname = Utilities::MakeLibnameFromPath(p2, pkgname); // remove last item
+          // Check if library exists
+          if ( !Utilities::FileExists(libname) )
+          {
+          // The following is *NOT* a debug time message :
+          // It's a user intended message.
+          // Please don't remove it.
+	    bbtkMessage("Output",3,"   [" <<libname 
+			<<"] : doesn't exist" <<std::endl);
+          }
+          else
+          {
+             ok = DoLoadPackage( libname, pkgname, path);         
+          }
+       }
+       else
+       {
+          bbtkError("Path ["<<upath<<"] doesn't exist");
+          return;
+       }
     }
- 
-   
-    bool ok = false; 
-    bool foundFile = false;    
+    else     // ----------------------------------------------------- iterate on the paths  
+    {
 
+    std::string path;
+    package_paths = ConfigurationFile::GetInstance().Get_package_paths();
     std::vector<std::string>::iterator i;
     for (i=package_paths.begin();i!=package_paths.end();++i)
-      {
-        foundFile = false;    
-	     std::string path = *i;
-	
-	// we *really* want '.' to be the current working directory
-        if (path == ".") {
+    {
+        foundFile = false;
+        path = *i;
+
+        // we *really* want '.' to be the current working directory
+        if (path == ".")
+        {
           char buf[2048]; // for getcwd
           char * currentDir = getcwd(buf, 2048);
-          std::string cwd(currentDir);        
+          std::string cwd(currentDir);
           path = currentDir;
         }
-	
+
         libname = Utilities::MakeLibnameFromPath(path, pkgname);
-	
-	     bbtkMessage("Debug",2,"-> Trying to load ["<<libname<<"]"<<std::endl);
+
+        bbtkMessage("Debug",2,"-> Trying to load [" << libname << "]" <<std::endl);
 
       // Check if library exists           
         if ( !Utilities::FileExists(libname) )
@@ -331,37 +375,38 @@ 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;
-            continue;  // try next path
+          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);
-	        break; // a package was found; we stop iterating
-	     }
+        {
+           bbtkMessage("Debug",2,"   OK"<<std::endl);
+           break; // a package was found; we stop iterating
+        }
     } //------------------ // end for ( package_paths.begin();i!=package_paths.end() )
-      //  }
+
+}
 
     if( !ok )  // nothing was loaded
     {
       if (!foundFile)
       {
-        bbtkError("could not find package ["<<pkgname<< "]");
+        bbtkError("Could not find package ["<<pkgname<< "]");
       }
       else
       {
 #if defined(__GNUC__)
-        bbtkError("could not load package \""<< pkgname
-                  <<"\" :" << std::endl << "   " <<dlerror());
+        bbtkError("Could not load package ["<< pkgname
+                  <<"] :" << std::endl << "   " << dlerror());
 #elif defined(_WIN32)
-        bbtkError("could not load package \""<<pkgname
-                 <<"\" : " << std::endl << "   " <<libname<<" not found");
+        bbtkError("Could not load package ["<<pkgname
+                 <<"] : " << std::endl << "   " <<libname<<" not found");
 
     // look how to get the error message on win
     //<<dlerror());
@@ -373,17 +418,15 @@ namespace bbtk
     bbtkMessage("Output",2,"[" << libname << "] loaded" << std::endl);
 
   }
-    
+
   //===================================================================
   /// \brief UnLoads a package.
   ///
   /// The package must have been previously loaded by LoadPackage.
   /// If the entry is found in the map, calls ClosePackage
- void Factory::UnLoadPackage( const std::string& userSuppliedName )
-  { 
-    std::string path;
-    std::string name = Utilities::ExtractPackageName(userSuppliedName,path);
-    bbtkDebugMessageInc("Core",7,"Factory::UnLoadPackage(\""
+ void Factory::UnLoadPackage( const std::string& name )
+ {
+    bbtkDebugMessageInc("Kernel",7,"Factory::UnLoadPackage(\""
                        <<name<<"\")"<<std::endl);
   
     PackageMapType::iterator i;
@@ -394,7 +437,7 @@ namespace bbtk
                 <<"\" : package not loaded !");
     }
     ClosePackage(i);
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //===================================================================
 
@@ -410,7 +453,7 @@ namespace bbtk
   /// Else simply 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);
 
@@ -431,16 +474,16 @@ namespace bbtk
                      <<"\" :"<<dlerror());
         }    
 #elif defined(_WIN32)
-        void *delf = GetProcAddress(i->second.mDynamicLibraryHandler, 
+   void *delf = GetProcAddress(i->second.mDynamicLibraryHandler, 
                                  delfname.c_str());
-        if (!delf)
-        {  
-           bbtkError("could not close package \""
+     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
@@ -462,7 +505,7 @@ namespace bbtk
 
     // remove the entry in the map
     mPackageMap.erase(i);
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
  }
   //===================================================================
 
@@ -472,7 +515,7 @@ namespace bbtk
   /// 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 )
@@ -483,26 +526,31 @@ namespace bbtk
       }
     }
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //===================================================================
 
   //===================================================================  
   /// Displays help on a package
-  void Factory::HelpPackage(const std::string& name/* &userSuppliedName */, bool adaptors) const
+  void Factory::HelpPackage(const std::string& name, bool adaptors) const
   {
-   // std::string name = ExtractPackageName(userSuppliedName);
-    bbtkDebugMessageInc("Core",9,"Factory::HelpPackage(\""<<name<<"\")"
+    bbtkDebugMessageInc("Kernel",9,"Factory::HelpPackage(\""<<name<<"\")"
                         <<std::endl);
 
     PackageMapType::const_iterator i = mPackageMap.find(name);
     if ( i != mPackageMap.end() ) 
       {
       bbtkMessage("Help",1, "Package "<<i->first<<" ");
+      
       if (i->second.mPackage->GetVersion().length()>0)
         bbtkMessageCont("Help",1,"v" <<i->second.mPackage->GetVersion());
+        
       if (i->second.mPackage->GetAuthor().length()>0)
         bbtkMessageCont("Help",1,"- "<<i->second.mPackage->GetAuthor());
+        
+      if (i->second.mPackage->GetCategory().length()>0)
+        bbtkMessageCont("Help",1,"- "<<i->second.mPackage->GetCategory());        
+        
       bbtkMessageCont("Help",1,std::endl);
       bbtkIncTab("Help",1);
       bbtkMessage("Help",1,i->second.mPackage->GetDescription()<<std::endl);
@@ -519,19 +567,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;
@@ -541,11 +592,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 <"
@@ -559,7 +611,7 @@ 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);
 
     PackageInfoType pack;
@@ -568,7 +620,7 @@ namespace bbtk
     pack.mPackage = p;
 
     mPackageMap[p->GetName()] = pack;
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //===================================================================
   
@@ -576,7 +628,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;
@@ -595,7 +647,7 @@ namespace bbtk
                  p->GetName()<<"\") : package absent from factory");
       }
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
   //===================================================================
   
@@ -605,7 +657,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; 
@@ -620,7 +672,7 @@ namespace bbtk
        bbtkError("black box type \""<<type<<"\" unknown");
       } 
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
     return b;
   }
   //===================================================================
@@ -631,7 +683,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);
@@ -652,7 +704,7 @@ namespace bbtk
           <<"> adaptor available");
       } 
     
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
     return b; 
   }
   //===================================================================
@@ -664,7 +716,7 @@ 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);
@@ -712,7 +764,7 @@ namespace bbtk
          } 
          c = new AdaptiveConnection(from,output,to,input,b);
       }
-      bbtkDebugDecTab("Core",7);
+      bbtkDebugDecTab("Kernel",7);
     
       return c;
     */
@@ -724,51 +776,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");
@@ -778,63 +831,256 @@ namespace bbtk
     fprintf( ff , "  color=lightgrey%s\n",";");
     fprintf( ff , "  rankdir=TB%s\n",";");
 
+    std::string url;
     PackageMapType::const_iterator i;
     for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
     {
-       std::string url = GetPackage(i->first)->GetDocURL();
-       fprintf(ff,"  %s [shape=ellipse, URL=\"%s\"]%s\n",
-	       i->first.c_str(),
-	       url.c_str(),";" );
+       url=GetPackage(i->first)->GetDocURL();
+       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
+ void Factory::ShowGraphTypes(const std::string& name) const
+ {
+
+   bool found = false;
+   PackageMapType::const_iterator i;
+   for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+   {
+      if (i->second.mPackage->ContainsBlackBox(name)) 
+      {
+         std::string separator = ConfigurationFile::GetInstance().Get_file_separator ();
+
+            // 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 ");
+#else 
+        std::string command("gnome-open ");
+#endif
+        command=command + directory +" tmp.html";
+        FILE *ff;
+        ff=fopen(filename2.c_str(),"w");
+
+        fprintf(ff,"<html><head><title>TMP</title> <script type=\"text/javascript\"> <!--\n");
+        fprintf(ff,"  window.location=\"%s#%s\";\n" , i->second.mPackage->GetDocURL().c_str(),name.c_str() );
+        fprintf(ff,"//--></script></head><body></body></html>\n");
+
+
+        //fprintf(ff, "<a  href=\"%s#%s\">Link</a>\n", i->second.mPackage->GetDocURL().c_str(),name.c_str() );
+        fclose(ff);
+        system( command.c_str() );      
+        found = true;
+     }
+   }
+    
+   bbtkDebugDecTab("Kernel",9);
+   if (!found) 
+   {
+      bbtkError("No package of the factory contains any black box <"
+                <<name<<">");
+   }
+ }
+    
+
+
+
+  void Factory::CreateHtmlIndex(IndexEntryType type, 
+				const std::string& filename)
   {
-    bool found = false;
+    bbtkDebugMessageInc("Kernel",9,"Factory::CreateHtmlIndex(\""
+			<<filename<<"\")"<<bbtkendl);
+    
+    std::string title;
+
+    typedef std::map<std::string, std::vector<BlackBoxDescriptor*> > IndexType;
+    IndexType index;
+    // Builds the index map
     PackageMapType::const_iterator i;
     for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
       {
-	if (i->second.mPackage->ContainsBlackBox(name)) 
+	Package* pack = i->second.mPackage;
+	if (pack->GetName()=="user") continue;
+	Package::BlackBoxMapType::const_iterator j;
+	for (j = pack->GetBlackBoxMap().begin(); 
+	     j!= pack->GetBlackBoxMap().end(); 
+	     ++j)
 	  {
-	    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"; 
 	    
-#if defined(_WIN32)  
-	    std::string command("start \"Titre\" /D ");
-#else 
-	    std::string command("gnome-open ");
-#endif
-	    command=command + directory +" tmp.html";
-	    FILE *ff;
-	    ff=fopen(filename2.c_str(),"w");
-	    
-	    fprintf(ff,"<html><head><title>TMP</title> <script type=\"text/javascript\"> <!--\n");
-	    fprintf(ff,"  window.location=\"%s#%s\";\n" , i->second.mPackage->GetDocURL().c_str(),name.c_str() );
-	    fprintf(ff,"//--></script></head><body></body></html>\n");
+	    // 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)
+	      {
+		std::string k("");
+		k += pack->GetName();
+		keys.push_back(k);
+		title = "Boxes by package";
+	      }
+	    else if ((type==Initials) || (type==Adaptors))
+	      {
+		std::string init(" ");
+		init[0] =  std::toupper(j->second->GetTypeName()[0]);
+		keys.push_back(init);
+		title = "Alphabetical list";
+	      }
+	    else if (type==Categories)
+	      {
+		// Split the category string 
+		std::string delimiters = ";,";
+		Utilities::SplitString(j->second->GetCategory(),
+				       delimiters,keys);
+		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 )
+	      {
+		IndexType::iterator p;
+		p = index.find(*k);
+		if (p != index.end()) 
+		  {
+		    p->second.push_back(j->second);
+		  }
+		else 
+		  {
+		    std::vector<BlackBoxDescriptor*> v;
+		    v.push_back(j->second);
+		    index[*k] = v;
+		  }
+	      }
 	    
-	    //fprintf(ff, "<a  href=\"%s#%s\">Link</a>\n", i->second.mPackage->GetDocURL().c_str(),name.c_str() );
-	    fclose(ff);
-	    system( command.c_str() );      
-	    found = true;
 	  }
-      }
+      }   
+    // Creates the file 
+    //---------------------
+    // Open output file
+    std::ofstream s;
+    s.open(filename.c_str());
+    if (!s.good()) 
+    {
+       bbtkError("Factory::CreateHtmlIndex : could not open file '"
+		 <<filename<<"'");
+    }
     
-    bbtkDebugDecTab("Core",9);
-    if (!found) 
+    //----------------------
+    // Html head
+    s << "<html lang=\"en\">\n";
+    s << "<head>\n";
+    s << "<title>"<<title<<"</title>\n";
+    s << "<meta http-equiv=\"Content-Type\" content=\"text/html\">\n";
+    s << "<meta name=\"description\" content=\""<<title<<"\">\n";
+    s << "<meta name=\"generator\" content=\"\">\n";
+    s << "<link title=\"Top\" rel=\"top\" href=\"#Top\">\n";
+    //<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
+    s << "<meta http-equiv=\"Content-Style-Type\" content=\"text/css\"><style type=\"text/css\"><!--\n";
+    s << "pre.display { font-family:inherit }\n";
+    s << "pre.format  { font-family:inherit }\n";
+    s << "pre.smalldisplay { font-family:inherit; font-size:smaller }\n";
+    s << "pre.smallformat  { font-family:inherit; font-size:smaller }\n";
+    s << "pre.smallexample { font-size:smaller }\n";
+    s << "pre.smalllisp    { font-size:smaller }\n";
+    s << "span.sc    { font-variant:small-caps }\n";
+    s << "span.roman { font-family:serif; font-weight:normal; } \n";
+    s << "span.sansserif { font-family:sans-serif; font-weight:normal; }\n"; 
+    s << "--></style>\n";
+    s << "</head>\n";
+    //----------------------
+
+    //----------------------
+    // 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 << "<a href=\"#"<<ii->first<<"\">"<<ii->first<<"</a>&nbsp;&nbsp;";	
+      }
+
+    for (ii=index.begin();ii!=index.end();++ii)
       {
-	bbtkError("No package of the factory contains any black box <"
-		  <<name<<">");
+	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";
+
+	std::vector<BlackBoxDescriptor*>::iterator di;
+	for (di=ii->second.begin();di!=ii->second.end();++di)
+	  {
+	    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 << "&nbsp;&nbsp;&nbsp;<a href=\""<<pack
+	      <<"/index.html#"<<name<<"\">"
+	      <<pack<<"::"<<name<<"</a>";
+	    s << "</TD> ";
+	    s << " <TD style='vertical-align: top;'>" << descr << " </TD>";
+	    s << "</TR>\n";
+	  }    
+	s << "</TABLE>\n";
+	s << "</ul>\n";
+	s << "</div>\n";
       }
+    //----------------------
+    // Footer 
+    time_t rawtime;
+    tm * ptm;
+    time ( &rawtime );
+    ptm = gmtime ( &rawtime );
+
+    s << "<p><hr>\n";
+    s << "Automatically generated by <b>bbi</b> on "
+      << ptm->tm_mday << "/" << ptm->tm_mon << "/" << ptm->tm_year+1900 
+      << " - " << ptm->tm_hour << ":" << ptm->tm_min << " GMT\n";
+    s << "</body></html>\n"; 
+    s.close();
+    //----------------------
+
+    // End
+    bbtkDebugDecTab("Kernel",9);
   }
 
+
 }