Mercurial > hg > orthanc

changeset 3522:00b0f4ce84e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <alain@mazy.be>
date Mon, 23 Sep 2019 17:48:12 +0200
parents 793c141be598 (diff) 77bede920d22 (current diff)
children d96379a965de
files
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Core/SystemToolbox.cpp	Thu Sep 19 13:11:11 2019 +0200
+++ b/Core/SystemToolbox.cpp	Mon Sep 23 17:48:12 2019 +0200
@@ -212,19 +212,23 @@
 
 
   void SystemToolbox::ReadFile(std::string& content,
-                               const std::string& path) 
+                               const std::string& path,
+                               bool log)
   {
     if (!IsRegularFile(path))
     {
       throw OrthancException(ErrorCode_RegularFileExpected,
-                             "The path does not point to a regular file: " + path);
+                             "The path does not point to a regular file: " + path,
+                             log);
     }
 
     boost::filesystem::ifstream f;
     f.open(path, std::ifstream::in | std::ifstream::binary);
     if (!f.good())
     {
-      throw OrthancException(ErrorCode_InexistentFile);
+      throw OrthancException(ErrorCode_InexistentFile,
+                             "File not found: " + path,
+                             log);
     }
 
     std::streamsize size = GetStreamSize(f);
--- a/Core/SystemToolbox.h	Thu Sep 19 13:11:11 2019 +0200
+++ b/Core/SystemToolbox.h	Mon Sep 23 17:48:12 2019 +0200
@@ -59,7 +59,8 @@
     ServerBarrierEvent ServerBarrier();
 
     void ReadFile(std::string& content,
-                  const std::string& path);
+                  const std::string& path,
+                  bool log = true);
 
     bool ReadHeader(std::string& header,
                     const std::string& path,