orthanc: OrthancServer/OrthancInitialization.cpp comparison

comparison OrthancServer/OrthancInitialization.cpp @ 810:401a9633e492

configuration into a namespace

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 07 May 2014 16:47:56 +0200
parents	2d9a000aa3a6
children	8a36c947490c

comparison

equal deleted inserted replaced

-:8ce2f69436ca
+:401a9633e492
 configuration_.reset(NULL);
 }
-std::string GetGlobalStringParameter(const std::string& parameter,
+std::string Configuration::GetGlobalStringParameter(const std::string& parameter,
 const std::string& defaultValue)
 {
 boost::mutex::scoped_lock lock(globalMutex_);
 if (configuration_->isMember(parameter))
 {
 return defaultValue;
 }
 }
-int GetGlobalIntegerParameter(const std::string& parameter,
+int Configuration::GetGlobalIntegerParameter(const std::string& parameter,
 int defaultValue)
 {
 boost::mutex::scoped_lock lock(globalMutex_);
 if (configuration_->isMember(parameter))
 {
 {
 return defaultValue;
 }
 }
-bool GetGlobalBoolParameter(const std::string& parameter,
-bool defaultValue)
+bool Configuration::GetGlobalBoolParameter(const std::string& parameter,
+bool defaultValue)
 {
 boost::mutex::scoped_lock lock(globalMutex_);
 if (configuration_->isMember(parameter))
 {
 return defaultValue;
 }
 }
+void Configuration::GetDicomModalityUsingSymbolicName(RemoteModalityParameters& modality,
+const std::string& name)
-void GetDicomModalityUsingSymbolicName(RemoteModalityParameters& modality,
-const std::string& name)
 {
 boost::mutex::scoped_lock lock(globalMutex_);
 if (!configuration_->isMember("DicomModalities"))
 {
 }
 }
-void GetOrthancPeer(OrthancPeerParameters& peer,
+void Configuration::GetOrthancPeer(OrthancPeerParameters& peer,
 const std::string& name)
 {
 boost::mutex::scoped_lock lock(globalMutex_);
 if (!configuration_->isMember("OrthancPeers"))
 {
 return true;
 }
-void GetListOfDicomModalities(std::set<std::string>& target)
+void Configuration::GetListOfDicomModalities(std::set<std::string>& target)
 {
 if (!ReadKeys(target, "DicomModalities", true))
 {
 throw OrthancException("Only alphanumeric and dash characters are allowed in the names of the modalities");
 }
 }
-void GetListOfOrthancPeers(std::set<std::string>& target)
+void Configuration::GetListOfOrthancPeers(std::set<std::string>& target)
 {
 if (!ReadKeys(target, "OrthancPeers", true))
 {
 throw OrthancException("Only alphanumeric and dash characters are allowed in the names of Orthanc peers");
 }
 }
-void SetupRegisteredUsers(MongooseServer& httpServer)
+void Configuration::SetupRegisteredUsers(MongooseServer& httpServer)
 {
 boost::mutex::scoped_lock lock(globalMutex_);
 httpServer.ClearUsers();
 httpServer.RegisterUser(username.c_str(), password.c_str());
 }
 }
-std::string InterpretRelativePath(const std::string& baseDirectory,
+std::string Configuration::InterpretRelativePath(const std::string& baseDirectory,
 const std::string& relativePath)
 {
 boost::filesystem::path base(baseDirectory);
 boost::filesystem::path relative(relativePath);
 /**
 {
 return (base / relative).string();
 }
 }
-std::string InterpretStringParameterAsPath(const std::string& parameter)
+std::string Configuration::InterpretStringParameterAsPath(const std::string& parameter)
 {
 boost::mutex::scoped_lock lock(globalMutex_);
 return InterpretRelativePath(defaultDirectory_.string(), parameter);
 }
-void GetGlobalListOfStringsParameter(std::list<std::string>& target,
+void Configuration::GetGlobalListOfStringsParameter(std::list<std::string>& target,
 const std::string& key)
 {
 boost::mutex::scoped_lock lock(globalMutex_);
 target.clear();
 target.push_back(lst[i].asString());
 }
 }
-bool IsSameAETitle(const std::string& aet1,
+bool Configuration::IsSameAETitle(const std::string& aet1,
 const std::string& aet2)
 {
 if (GetGlobalBoolParameter("StrictAetComparison", false))
 {
 // Case-sensitive matching
 return aet1 == aet2;
 return tmp1 == tmp2;
 }
 }
-bool LookupDicomModalityUsingAETitle(RemoteModalityParameters& modality,
+bool Configuration::LookupDicomModalityUsingAETitle(RemoteModalityParameters& modality,
 const std::string& aet)
 {
 std::set<std::string> modalities;
 GetListOfDicomModalities(modalities);
 for (std::set<std::string>::const_iterator
 return false;
 }
-bool IsKnownAETitle(const std::string& aet)
+bool Configuration::IsKnownAETitle(const std::string& aet)
 {
 RemoteModalityParameters modality;
 return LookupDicomModalityUsingAETitle(modality, aet);
 }
-RemoteModalityParameters GetModalityUsingSymbolicName(const std::string& name)
+RemoteModalityParameters Configuration::GetModalityUsingSymbolicName(const std::string& name)
 {
 RemoteModalityParameters modality;
 GetDicomModalityUsingSymbolicName(modality, name);
 return modality;
 }
-RemoteModalityParameters GetModalityUsingAet(const std::string& aet)
+RemoteModalityParameters Configuration::GetModalityUsingAet(const std::string& aet)
 {
 RemoteModalityParameters modality;
 if (LookupDicomModalityUsingAETitle(modality, aet))
 {
 throw OrthancException("Unknown modality for AET: " + aet);
 }
 }
-void UpdateModality(const RemoteModalityParameters& modality)
+void Configuration::UpdateModality(const RemoteModalityParameters& modality)
 {
 boost::mutex::scoped_lock lock(globalMutex_);
 if (!configuration_->isMember("DicomModalities"))
 {
 modality.ToJson(v);
 modalities[modality.GetName()] = v;
 }
-void RemoveModality(const std::string& symbolicName)
+void Configuration::RemoveModality(const std::string& symbolicName)
 {
 boost::mutex::scoped_lock lock(globalMutex_);
 if (!configuration_->isMember("DicomModalities"))
 {
 modalities.removeMember(symbolicName.c_str());
 }
-void UpdatePeer(const OrthancPeerParameters& peer)
+void Configuration::UpdatePeer(const OrthancPeerParameters& peer)
 {
 boost::mutex::scoped_lock lock(globalMutex_);
 if (!configuration_->isMember("OrthancPeers"))
 {
 peer.ToJson(v);
 peers[peer.GetName()] = v;
 }
-void RemovePeer(const std::string& symbolicName)
+void Configuration::RemovePeer(const std::string& symbolicName)
 {
 boost::mutex::scoped_lock lock(globalMutex_);
 if (!configuration_->isMember("OrthancPeers"))
 {

Mercurial > hg > orthanc

comparison OrthancServer/OrthancInitialization.cpp @ 810:401a9633e492