Mercurial > hg > orthanc

comparison OrthancServer/OrthancConfiguration.cpp @ 3186:92bbc5274220

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <alain@mazy.be>
date Fri, 01 Feb 2019 17:54:06 +0100
parents 5d1f5984dc41
children 8f44dadcdbc1
comparison
equal deleted inserted replaced
3185:c6dab987f43a 3186:92bbc5274220
36 36
37 #include "../Core/HttpServer/HttpServer.h" 37 #include "../Core/HttpServer/HttpServer.h"
38 #include "../Core/Logging.h" 38 #include "../Core/Logging.h"
39 #include "../Core/OrthancException.h" 39 #include "../Core/OrthancException.h"
40 #include "../Core/SystemToolbox.h" 40 #include "../Core/SystemToolbox.h"
41 #include "../Core/TemporaryFile.h"
41 #include "../Core/Toolbox.h" 42 #include "../Core/Toolbox.h"
42 43
43 #include "ServerIndex.h" 44 #include "ServerIndex.h"
44 45
45 46
46 static const char* const DICOM_MODALITIES = "DicomModalities"; 47 static const char* const DICOM_MODALITIES = "DicomModalities";
47 static const char* const DICOM_MODALITIES_IN_DB = "DicomModalitiesInDatabase"; 48 static const char* const DICOM_MODALITIES_IN_DB = "DicomModalitiesInDatabase";
48 static const char* const ORTHANC_PEERS = "OrthancPeers"; 49 static const char* const ORTHANC_PEERS = "OrthancPeers";
49 static const char* const ORTHANC_PEERS_IN_DB = "OrthancPeersInDatabase"; 50 static const char* const ORTHANC_PEERS_IN_DB = "OrthancPeersInDatabase";
51 static const char* const TEMPORARY_DIRECTORY = "TemporaryDirectory";
50 52
51 namespace Orthanc 53 namespace Orthanc
52 { 54 {
53 static void AddFileToConfiguration(Json::Value& target, 55 static void AddFileToConfiguration(Json::Value& target,
54 const boost::filesystem::path& path) 56 const boost::filesystem::path& path)
824 826
825 void OrthancConfiguration::ResetServerIndex() 827 void OrthancConfiguration::ResetServerIndex()
826 { 828 {
827 serverIndex_ = NULL; 829 serverIndex_ = NULL;
828 } 830 }
831
832
833 TemporaryFile* OrthancConfiguration::CreateTemporaryFile() const
834 {
835 if (json_.isMember(TEMPORARY_DIRECTORY))
836 {
837 return new TemporaryFile(InterpretStringParameterAsPath(GetStringParameter(TEMPORARY_DIRECTORY, ".")), "");
838 }
839 else
840 {
841 return new TemporaryFile;
842 }
843 }
829 } 844 }