Module: $RCSfile: bbtkFactory.cxx,v $
Language: C++
-Date: $Date: 2008/01/22 16:55:04 $
-Version: $Revision: 1.2 $
+Date: $Date: 2008/01/28 09:12:49 $
+Version: $Revision: 1.3 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
// ===================================================================================
bool Factory::DoLoadPackage(std::string libname,
- std::string pkgname,
- std::string path,
- bool verbose)
+ std::string pkgname,
+ std::string path,
+ bool verbose)
{
#if defined(__GNUC__)
- void *handler;
- handler = dlopen(libname.c_str(),
+ 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
}
-
+
+ // 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;
dlclose(handler);
bbtkError("DeletePackage : could not load package \""<<pkgname
<<"\" [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;
+ // 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)
<<"\" : "<<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<<" 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
-
+#endif
+
// Stores the package
PackageInfoType pack;
pack.mDynamicLibraryHandler = handler;
std::string v(pack.mPackage->GetBBTKVersion());
UnLoadPackage(pkgname);
bbtkError(" package build with bbtk version "
- << v
- << " whereas application build with version "
- << bbtk::GetVersion());
+ << 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);
-
+ 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);
+
//===================================================================
bbtkMessage("Output",2,pack.mPackage->GetName()<<" "
<<pack.mPackage->GetVersion()
<<" (bbtk "
<<pack.mPackage->GetBBTKVersion()<<") "
- <<pack.mPackage->GetAuthor()
+ <<pack.mPackage->GetAuthor()
<<std::endl);
bbtkMessage("Output",2,pack.mPackage->GetDescription()<<std::endl);
//===================================================================
return true;
}
- //===================================================================
+ //===================================================================
/// \brief Loads a package.
///
/// The name is the system-independant name of the package (the name of the instance of bbtk::Package).
/// 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)
{
// 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("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);
+
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);
// 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);
+ // std::string path = Utilities::ExpandLibName(upath, verbose);
+ std::string path = Utilities::ExpandLibName(name, verbose); // 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.
+ if (verbose)
+ std::cout <<" [" <<libname <<"] : doesn't exist" <<std::endl;
+ }
+ else
+ {
+ ok = DoLoadPackage( libname, pkgname, path, verbose);
+ }
+ }
+ 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) )
// 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
+ if (verbose)
+ std::cout <<" [" <<libname <<"] : doesn't exist" <<std::endl;
+ continue; // try next path
}
foundFile = true;
// Try to Load the library
-
+
ok = DoLoadPackage( libname, pkgname, path, verbose);
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
{
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());
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);
+ void Factory::UnLoadPackage( const std::string& name )
+ {
bbtkDebugMessageInc("Core",7,"Factory::UnLoadPackage(\""
<<name<<"\")"<<std::endl);
<<"\" :"<<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
//===================================================================
/// 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<<"\")"
<<std::endl);
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);
//===================================================================
- void Factory::ShowGraphTypes(const std::string& name) const
- {
- bool found = false;
- PackageMapType::const_iterator i;
- for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+ 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))
{
- if (i->second.mPackage->ContainsBlackBox(name))
- {
- std::string separator = ConfigurationFile::GetInstance().Get_file_separator ();
-
+ 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";
-
+ 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 ");
+ std::string command("start \"Titre\" /D ");
#else
- std::string command("gnome-open ");
+ 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;
- }
- }
+ 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("Core",9);
- if (!found)
- {
- bbtkError("No package of the factory contains any black box <"
- <<name<<">");
- }
- }
+ bbtkDebugDecTab("Core",9);
+ if (!found)
+ {
+ bbtkError("No package of the factory contains any black box <"
+ <<name<<">");
+ }
+ }
}
Program: bbtk
Module: $RCSfile: bbtkInterpreter.cxx,v $ $
Language: C++
- Date: $Date: 2008/01/23 07:51:51 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2008/01/28 09:12:49 $
+ Version: $Revision: 1.4 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
std::cout << "* LINE : "<<mLine.back()<<std::endl;
}
}
-
+
CloseAllFiles();
bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
bbtkDecTab("Interpreter",9);
std::vector<std::string> words;
SplitLine(line,words);
-
+
// Empty line
if (words.size()<1)
{
bbtkMessage("Interpreter",9,"Multiline Comment"<<std::endl);
return;
}
-
+
// Command
CommandInfoType command;
InterpretCommand(words,command);
switch (command.code)
{
case cNew :
- mExecuter->Create(words[1],words[2]);
- break;
+ mExecuter->Create(words[1],words[2]);
+ break;
case cDelete :
- // TO DO !!
- // mExecuter->Remove(words[1]);
- break;
+ // TO DO !!
+ // mExecuter->Remove(words[1]);
+ break;
case cConnect :
- Utilities::SplitAroundFirstDot(words[1],left,right);
- Utilities::SplitAroundFirstDot(words[2],left2,right2);
- mExecuter->Connect(left,right,left2,right2);
- break;
+ Utilities::SplitAroundFirstDot(words[1],left,right);
+ Utilities::SplitAroundFirstDot(words[2],left2,right2);
+ mExecuter->Connect(left,right,left2,right2);
+ break;
case cDefine :
- if (mFileName.size()>0)
- {
- filename = Utilities::get_file_name(mFileName.back());
- }
- if (words.size()==2)
- {
- mExecuter->Define(words[1],"user",filename);
- }
- else
- {
- mExecuter->Define(words[1],words[2],filename);
- }
- break;
+ if (mFileName.size()>0)
+ {
+ filename = Utilities::get_file_name(mFileName.back());
+ }
+ if (words.size()==2)
+ {
+ mExecuter->Define(words[1],"user",filename);
+ }
+ else
+ {
+ mExecuter->Define(words[1],words[2],filename);
+ }
+ break;
case cEndDefine :
- mExecuter->EndDefine();
- break;
+ mExecuter->EndDefine();
+ break;
case cPrint :
- Print(words[1]); /// \todo use mExecuter
- break;
+ Print(words[1]); /// \todo use mExecuter
+ break;
case cExec :
- if (words[1]=="freeze")
- mExecuter->SetNoExecMode(true);
- else if (words[1]=="unfreeze")
- mExecuter->SetNoExecMode(false);
- else
- mExecuter->Update(words[1]);
- break;
+ if (words[1]=="freeze")
+ mExecuter->SetNoExecMode(true);
+ else if (words[1]=="unfreeze")
+ mExecuter->SetNoExecMode(false);
+ else
+ mExecuter->Update(words[1]);
+ break;
case cInput :
- Utilities::SplitAroundFirstDot(words[2],left,right);
- mExecuter->DefineInput(words[1],left,right,words[3]);
- break;
+ Utilities::SplitAroundFirstDot(words[2],left,right);
+ mExecuter->DefineInput(words[1],left,right,words[3]);
+ break;
case cOutput :
- Utilities::SplitAroundFirstDot(words[2],left,right);
- mExecuter->DefineOutput(words[1],left,right,words[3]);
- break;
+ Utilities::SplitAroundFirstDot(words[2],left,right);
+ mExecuter->DefineOutput(words[1],left,right,words[3]);
+ break;
case cSet :
- Utilities::SplitAroundFirstDot(words[1],left,right);
- mExecuter->Set(left,right,words[2]);
- break;
+ Utilities::SplitAroundFirstDot(words[1],left,right);
+ mExecuter->Set(left,right,words[2]);
+ break;
case cAuthor :
- mExecuter->Author(words[1]);
- break;
+ mExecuter->Author(words[1]);
+ break;
case cDescription :
- mExecuter->Description(words[1]);
- break;
+ mExecuter->Description(words[1]);
+ break;
case cHelp :
- Help(words);
- break;
+ Help(words);
+ break;
case cMessage :
- if (words.size()<3)
- {
+ if (words.size()<3)
+ {
bbtk::MessageManager::PrintInfo();
- }
- else
- {
+ }
+ else
+ {
sscanf(words[2].c_str(),"%d",&level);
bbtk::MessageManager::SetMessageLevel(words[1],level);
- }
- break;
+ }
+ break;
case cGraph :
- Graph(words);
- break;
+ Graph(words);
+ break;
case cConfig :
- if (words.size()>1) // any param for config means verbose = true
- verbose = true;
- else
- verbose = false;
- Config(verbose);
- break;
+ if (words.size()>1) // any param for config means verbose = true
+ verbose = true;
+ else
+ verbose = false;
+ Config(verbose);
+ break;
case cReset : // EED
- this->mExecuter->Reset();
- break;
+ this->mExecuter->Reset();
+ break;
case cInclude :
- if (mCommandLine)
- {
+ if (mCommandLine)
+ {
InterpretFile(words[1], true, verbose); // true : better pass use_config_file
- }
- else
- {
+ }
+ else
+ {
SwitchToFile(words[1], true, verbose); // true : better pass use_config_file
- }
- break;
+ }
+ break;
case cLoad:
- LoadPackage(words[1], true, verbose); // true : better pass use_config_file
- break;
+ LoadPackage(words[1], true, verbose); // true : better pass use_config_file
+ break;
case cUnload:
- UnLoadPackage(words[1]);
- break;
+ UnLoadPackage(words[1]);
+ break;
case cQuit :
- throw QuitException();
- break;
+ throw QuitException();
+ break;
- case cWorkspace :
- if (words.size() == 2)
- {
- if (words[1]=="freeze") mExecuter->SetNoExecMode(true);
- else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false);
- }
- else
- {
- mExecuter->SetWorkspaceName(words[2]);
- }
- break;
+ case cWorkspace :
+ if (words.size() == 2)
+ {
+ if (words[1]=="freeze") mExecuter->SetNoExecMode(true);
+ else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false);
+ }
+ else
+ {
+ mExecuter->SetWorkspaceName(words[2]);
+ }
+ break;
default:
- bbtkInternalError("should not reach here !!!");
+ bbtkInternalError("should not reach here !!!");
}
bbtkDecTab("Interpreter",9);
void Interpreter::SwitchToFile( const std::string& name,
bool use_configuration_file, bool verbose)
{
+ // Note : in the following :
+ // name : the user supplied name
+ // - abreviated name e.g. scr scr.bbs
+ // - relative full name e.g. ./scr.bbs ../../scr.bbs
+ // - absolute full name e.g. /home/usrname/proj/dir/scr.bbs
+ // same for Windows, with c:, d: ...
+ //
bbtkDebugMessageInc("Interpreter",9,"Interpreter::SwitchToFile( \""
<<name<<"\")"<<std::endl);
std::string pkgname; // e.g. <scriptname>.bbs
pkgname = Utilities::ExtractScriptName(name);
-
+std::cout << "pkgname [" << pkgname << "] name [" << name << "]" << std::endl;
if (use_configuration_file)
{
if (verbose)
bool fullnameGiven = false;
bool foundFile = false;
std::string::size_type slash_position = name.find_last_of("/\\");
-
+
if (slash_position != std::string::npos)
- {
- fullnameGiven = true;
+ { // ------------------------------------- check user supplied location
+ fullnameGiven = true;
libname = Utilities::ExpandLibName(name, verbose);
if (libname != "") {
if ( Utilities::FileExists(libname))
}
}
}
- else // ----------------------- iterate on the paths
+ else // ------------------------------------- iterate on the paths
{
- std::string path;
+ std::string path;
std::vector<std::string>::iterator i;
for (i=script_paths.begin();i!=script_paths.end();++i)
{
if (path == ".") {
char buf[2048]; // for getcwd
char * currentDir = getcwd(buf, 2048);
- std::string cwd(currentDir);
+ std::string cwd(currentDir);
path = currentDir;
}
// 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.
if (verbose)
std::cout <<" [" <<libname <<"] : doesn't exist" <<std::endl;
- continue; // try next path
+ continue; // try next path
}
foundFile = true;
break; // a script was found; we stop iterating
{
if (fullnameGiven)
if(libname == "")
- bbtkError("Path \""<<name<<"\" doesn't exist");
+ bbtkError("Path ["<<name<<"] doesn't exist");
else
- bbtkError("Script \""<<libname<<"\" not found");
+ bbtkError("Script ["<<libname<<"] not found");
else
- bbtkError("No \""<<pkgname<<".bbs\" script found");
+ bbtkError("No ["<<pkgname<<".bbs] script found");
return;
}
s->open(libname.c_str());
if (!s->good())
{
- bbtkError("Could not open file \""<<libname<<"\"");
+ bbtkError("Could not open file ["<<libname<<"]");
return;
}
bool insideComment = false; // for multiline comment
do
{
- try
+ try
{
std::string line;
GetLineFromPrompt(line);
}
catch (std::exception& e)
{
- std::cerr << "* ERROR : "<<e.what()<<" (not in bbtk)"<<std::endl;
+ std::cerr << "* ERROR :: "<<e.what()<<" (not in bbtk)"<<std::endl;
}
catch (...)
{
Program: bbtk
Module: $RCSfile: bbtkUtilities.h,v $
Language: C++
- Date: $Date: 2008/01/23 07:51:51 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2008/01/28 09:12:49 $
+ Version: $Revision: 1.4 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See doc/license.txt or
#define BBTK_USE_TERMIOS_BASED_PROMPT
#endif
+//#include "bbtkMessageManager.h"
+
namespace bbtk
{
/// Holds various usefull methods
struct BBTK_EXPORT Utilities
{
+
+
+// ===================================================================================
+
// See : http://www.techbytes.ca/techbyte103.html for more O.S.
static inline bool FileExists(std::string strFilename)
{
std::string::size_type slash_position = name.find_last_of("/\\");
if (slash_position != std::string::npos)
- {
- pkgname = name.substr(slash_position+1,std::string::npos);
- path = name.substr(0,slash_position);
- // std::cout << "F:P='"<<path<<"'"<<std::endl;//+1,std::string::npos);
- }
+ {
+ pkgname = name.substr(slash_position+1,std::string::npos);
+ path = name.substr(0,slash_position);
+ // std::cout << "F:P='"<<path<<"'"<<std::endl;//+1,std::string::npos);
+ }
else
- {
- pkgname = name;
- }
-
+ {
+ pkgname = name;
+ }
+
// remove {.so | dll} if any
std::string::size_type dot_position = pkgname.find_last_of('.');
if (dot_position != std::string::npos){
pkgname = pkgname.substr(0,dot_position);
}
#if defined(__GNUC__)
-
+
// GCC mechanism
// shared lib name = libbb<name>.so
// remove {bb} if any
if (memcmp (pkgname.c_str(), "bb", 2) == 0) {
pkgname = pkgname.substr(2, pkgname.length());
- }
-
+ }
+
/*
/// \ \todo what would happen if (stupid) user names his package 'bb' ?!?
/// \ --> Should be forbidden!
char * currentDir = getcwd(buf, 2048);
std::string cwd(currentDir);
std::string libname(name);
-
+ std::string fileSeparator;
+ fileSeparator = ConfigurationFile::GetInstance().Get_file_separator();
// tooHigh : true is user supplies a library pathname with too many "../"
bool tooHigh = false;
-
+
+//std::cout << "------------------cwd [" << cwd << "]" << std::endl;
+
if ( name[0] == '/' || name[0] == '\\' )
{
return(libname);
- }
- else if (name[0] == '.' && (name[1] == '/' || name[1] == '\\') )
+ }
+ else if ( name =="." )
{
- libname = cwd + ConfigurationFile::GetInstance().Get_file_separator () + name.substr(2, name.length());
+ libname = cwd + fileSeparator;
return(libname);
- }
- else if ( name[0] == '.' && name[1] == '.' && (name[2] == '/' || name[2] == '\\') )
+ }
+ else if (name[0] == '.' && (name[1] == '/' || name[1] == '\\') )
+ {
+ libname = cwd + fileSeparator + name.substr(2, name.length());
+ return(libname);
+ }
+ else if ( name[0] == '.' && name[1] == '.' /* && (name[2] == '/' || name[2] == '\\') */ )
{
if ( IsAtRoot(cwd) ) // hope it gets / (for Linux), C: D: (for Windows)
{
// iterate on ../ and go up from the current working dir!
std::string a(name);
bool alreadyProcessRoot = false;
- for(;;)
+
+ //if (a[a.size()-1] != fileSeparator[0])
+ // a.append(fileSeparator);
+//std::cout << "------------------a [" << a << "]" << std::endl;
+
+ for(;;) // wild loop !
{
- std::string::size_type slash_position = cwd.find_last_of(ConfigurationFile::GetInstance().Get_file_separator ());
+ std::string::size_type slash_position = cwd.find_last_of(fileSeparator);
if (slash_position != std::string::npos) {
if (slash_position == 0)
slash_position = 1;
cwd = cwd.substr(0,slash_position/*+1*/);
- a = a.substr(3, name.length()); // remove ../
+//std::cout << "------------------cwd [" << cwd << "]" << std::endl;
+ // if (a == "..") {
+ // a = "";
+ // break;
+ // }
+ // else
+ a = a.substr(3, /*name.length()*/ a.length()); // remove ../
+//std::cout << "------------------a [" << a << "]" << std::endl;
if (a == "" || alreadyProcessRoot)
{
if (verbose)
- std::cout << " File path [" << name << "] doesn't exist" << std::endl;
+ std::cout << " File path : [" << name << "] doesn't exist" << std::endl;
tooHigh = true;
break;
}
libname = cwd;
char c = cwd[cwd.size()-1];
if (c != '/' && c != '\\' )
- libname += ConfigurationFile::GetInstance().Get_file_separator ();
+ libname += fileSeparator;
libname += a;
if ( a[0] != '.' ) // if . (probabely ../), loop again
}
} // end iterating on ../
}
+//std::cout << "------------------out of loop]" << std::endl;
if (tooHigh)
libname="";
return (libname);
} // ----- End of expanding path name ( ./ ../ ../../ )
+ std::cout <<"* ERROR in ExpandLibName : should never get here!" << std::endl;
// To avoid warning
return(""); // Will never get here!
}
#if defined(__GNUC__)
if (c != '/')
libname += "/libbb";
+ else
+ libname += "libbb";
libname += pkgname;
libname += ".so";
return(false);
}
+
// ===================================================================================
static inline void SplitAroundFirstDot( const std::string& in,
}
else
{
- // bbtkError(in<<" : expected 'a.b' format but no dot found");
- left ="";
- right = "";
+ // bbtkError(in<<" : expected 'a.b' format but no dot found");
+ left ="";
+ right = "";
}
}
+// ===================================================================================
+
static inline std::string get_file_name(const std::string& s)
{
std::string::size_type slash_position = s.find_last_of("/\\");
//========================================================================
- // Usefull functions for html generation
-
- //========================================================================
+ // Usefull functions for html generation
+ //========================================================================
+
static inline void replace( std::string& str,
const std::string& from,
const std::string& to )
}
//========================================================================
- //========================================================================
static inline void html_format(std::string& str)
{
replace( str, "&", "&" );
git://git.creatis.insa-lyon.fr / bbtk.git / commitdiff