Mercurial > hg > orthanc

changeset 1631:0d074f5f6069

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 21 Sep 2015 13:33:50 +0200
parents ffd23c0104af
children eb8fbcf008b5
files OrthancServer/OrthancRestApi/OrthancRestSystem.cpp Plugins/Engine/SharedLibrary.cpp
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/OrthancRestApi/OrthancRestSystem.cpp	Mon Sep 21 13:26:45 2015 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestSystem.cpp	Mon Sep 21 13:33:50 2015 +0200
@@ -69,12 +69,14 @@
 
     if (plugins.HasStorageArea())
     {
-      result["StorageAreaPlugin"] = plugins.GetStorageAreaLibrary().GetPath();
+      std::string p = plugins.GetStorageAreaLibrary().GetPath();
+      result["StorageAreaPlugin"] = boost::filesystem::canonical(p).string();
     }
 
     if (plugins.HasDatabaseBackend())
     {
-      result["DatabaseBackendPlugin"] = plugins.GetDatabaseBackendLibrary().GetPath();
+      std::string p = plugins.GetDatabaseBackendLibrary().GetPath();
+      result["DatabaseBackendPlugin"] = boost::filesystem::canonical(p).string();     
     }
 
     call.GetOutput().AnswerJson(result);
--- a/Plugins/Engine/SharedLibrary.cpp	Mon Sep 21 13:26:45 2015 +0200
+++ b/Plugins/Engine/SharedLibrary.cpp	Mon Sep 21 13:33:50 2015 +0200
@@ -48,10 +48,10 @@
 
 namespace Orthanc
 {
-  SharedLibrary::SharedLibrary(const std::string& path) : handle_(NULL)
+  SharedLibrary::SharedLibrary(const std::string& path) : 
+    path_(path), 
+    handle_(NULL)
   {
-    path_ = boost::filesystem::canonical(path).string();
-
 #if defined(_WIN32)
     handle_ = ::LoadLibraryA(path_.c_str());
     if (handle_ == NULL)