Mercurial > hg > orthanc
comparison OrthancServer/OrthancInitialization.cpp @ 427:9d2e1009076a
fix for fedora 18
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 08 May 2013 12:51:39 +0200 |
parents | 2d269089078f |
children | 6f00823be12a |
comparison
equal
deleted
inserted
replaced
426:53d79c963e4a | 427:9d2e1009076a |
---|---|
281 | 281 |
282 | 282 |
283 std::string InterpretStringParameterAsPath(const std::string& parameter) | 283 std::string InterpretStringParameterAsPath(const std::string& parameter) |
284 { | 284 { |
285 boost::mutex::scoped_lock lock(globalMutex_); | 285 boost::mutex::scoped_lock lock(globalMutex_); |
286 return (defaultDirectory_ / parameter).string(); | 286 |
287 boost::filesystem::path p(parameter); | |
288 | |
289 if (p.is_absolute()) | |
290 { | |
291 return p.string(); | |
292 } | |
293 else | |
294 { | |
295 return (defaultDirectory_ / parameter).string(); | |
296 } | |
287 } | 297 } |
288 | 298 |
289 | 299 |
290 void GetGlobalListOfStringsParameter(std::list<std::string>& target, | 300 void GetGlobalListOfStringsParameter(std::list<std::string>& target, |
291 const std::string& key) | 301 const std::string& key) |