orthanc: OrthancServer/OrthancInitialization.cpp comparison

unit test for fedora 18 problem

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 08 May 2013 15:13:01 +0200
parents	6f00823be12a
children	f746592d8301

comparison

equal deleted inserted replaced

-:6f00823be12a
+:09b3c6265a94
 httpServer.RegisterUser(username.c_str(), password.c_str());
 }
 }
-std::string InterpretStringParameterAsPath(const std::string& parameter)
+std::string InterpretRelativePath(const std::string& baseDirectory,
-{
+const std::string& relativePath)
-boost::mutex::scoped_lock lock(globalMutex_);
+{
+boost::filesystem::path base(baseDirectory);
+boost::filesystem::path relative(relativePath);
+return (base / relative).string();
 /**
 The following lines should be equivalent to this one:
-return (defaultDirectory_ / parameter).string();
+return (base / relative).string();
 However, for some unknown reason, some versions of Boost do not
-make the proper path resolution when "defaultDirectory_" is an
+make the proper path resolution when "baseDirectory" is an
 absolute path. So, a hack is used below.
 **/
-boost::filesystem::path p(parameter);
+if (relative.is_absolute())
+{
-if (p.is_absolute())
+return relative.string();
-{
+}
-return p.string();
+else
-}
+{
-else
+return (base / relative).string();
-{
+}
-return (defaultDirectory_ / parameter).string();
+}
-}
+std::string InterpretStringParameterAsPath(const std::string& parameter)
+{
+boost::mutex::scoped_lock lock(globalMutex_);
+return InterpretRelativePath(defaultDirectory_.string(), parameter);
 }
 void GetGlobalListOfStringsParameter(std::list<std::string>& target,
 const std::string& key)

Mercurial > hg > orthanc