X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkFactory.cxx;h=aa3ee5c2fbc3073d45e7c036de6f89594ca99e43;hb=6ea571ab3b7a539aaaca066db3941f5017920209;hp=fc029ffe30cd4b5148eca6364bcd196255bc4fd0;hpb=71376d8384d5d21b5c56d36ecc8cbf31315c039a;p=bbtk.git

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index fc029ff..aa3ee5c 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/05 13:23:46 $
-Version:   $Revision: 1.14 $
+Date:      $Date: 2008/02/21 09:37:23 $
+Version:   $Revision: 1.23 $
                                                                                 
 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
@@ -100,154 +100,151 @@ namespace bbtk
   //===================================================================
 
 
-// ===================================================================================
-
+  // ===================================================================
   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)();
+    
+    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;
-
-        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() << " Category(s) :"
-           <<pack.mPackage->GetCategory()
-           <<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("Kernel",7);
-        return true;
+    
+    bbtkDebugDecTab("Kernel",7);
+    return true;
   }
-
+  
   //===================================================================
   /// \brief Loads a package.
   ///
@@ -258,14 +255,14 @@ 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)
+                             bool use_configuration_file)
   {
   // Note : in the following :
   // name : the user supplied name
@@ -322,8 +319,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 +334,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 +378,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 +400,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
@@ -583,7 +580,10 @@ namespace bbtk
 
   //===================================================================
   /// 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("Kernel",9,"Factory::HelpBlackBox(\""<<name<<"\")"
                         <<std::endl);
@@ -595,6 +595,7 @@ namespace bbtk
       if (i->second.mPackage->ContainsBlackBox(name)) 
         {
           i->second.mPackage->HelpBlackBox(name,full);
+	      package = i->second.mPackage->GetName();
           found = true;
         }
       }
@@ -822,6 +823,7 @@ namespace bbtk
   //===================================================================
   void Factory::WriteDotFilePackagesList(FILE *ff)
   {
+
     bbtkDebugMessageInc("Kernel",9,"Factory::WriteDotFilePackagesList()"
                          <<std::endl);
 
@@ -847,6 +849,7 @@ namespace bbtk
 
  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 +858,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 ");
@@ -920,7 +923,7 @@ namespace bbtk
 		std::string k("");
 		k += pack->GetName();
 		keys.push_back(k);
-		title = "List by package";
+		title = "Boxes by package";
 	      }
 	    else if (type==Initials)
 	      {
@@ -931,24 +934,13 @@ namespace bbtk
 	      }
 	    else if (type==Categories)
 	      {
-
 		// Split the category string 
-		//std::vector<std::string> categories;
-
 		std::string delimiters = ";,";
 		Utilities::SplitString(j->second->GetCategory(),
 				       delimiters,keys);
-
-		//std::vector<std::string>::iterator si;
-		//for (si=categories.begin();si!=categories.end;++si)
-		//  {
-		//    keys.push_back(*si);
-		//  }
-		title = "Index by category";
-
 		if (keys.size()==0) 
 		  keys.push_back(" NONE");
-		title = "List by category";
+		title = "Boxes by category";
 	      }
 	    
 	    std::vector<std::string>::const_iterator k;
@@ -1021,8 +1013,22 @@ namespace bbtk
       {
 	s << "<p><hr>\n";
 	s << "<p><a href=\"#Top\">Top</a>";
-	s << "<a name=\""<<ii->first<<"\"></a>\n"; 
-	s << "<p><b>"<<ii->first<<"</b>\n";
+	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";
@@ -1032,10 +1038,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> ";
@@ -1043,7 +1051,7 @@ namespace bbtk
 	    s << "</TR>\n";
 	  }    
 	s << "</TABLE>\n";
-	s << "</li></ul>\n";
+	s << "</ul>\n";
 	s << "</div>\n";
       }
     //----------------------