orthanc: OrthancServer/OrthancConfiguration.cpp comparison

comparison OrthancServer/OrthancConfiguration.cpp @ 2956:bfee0b9f3209

cont

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 03 Dec 2018 15:11:42 +0100
parents	bbfd95a0c429
children	4e43e67f8ecf

comparison

equal deleted inserted replaced

-:bbfd95a0c429
+:bfee0b9f3209
 static void ReadConfiguration(Json::Value& target,
 const char* configurationFile)
 {
 target = Json::objectValue;
-if (configurationFile)
+if (configurationFile != NULL)
 {
 if (!boost::filesystem::exists(configurationFile))
 {
-LOG(ERROR) << "Inexistent path to configuration: " << configurationFile;
+throw OrthancException(ErrorCode_InexistentFile,
-throw OrthancException(ErrorCode_InexistentFile);
+"Inexistent path to configuration: " +
+std::string(configurationFile));
 }
 if (boost::filesystem::is_directory(configurationFile))
 {
 ScanFolderForConfiguration(target, configurationFile);
 for (size_t j = 0; j < s.size(); j++)
 {
 if (!isalnum(s[j]) &&
 s[j] != '-')
 {
-LOG(ERROR) << "Only alphanumeric and dash characters are allowed "
+throw OrthancException(ErrorCode_BadFileFormat,
-<< "in the names of modalities/peers, but found: " << s;
+"Only alphanumeric and dash characters are allowed "
-throw OrthancException(ErrorCode_BadFileFormat);
+"in the names of modalities/peers, but found: " + s);
 }
 }
 }
 {
 modalities_.clear();
 if (source.type() != Json::objectValue)
 {
-LOG(ERROR) << "Bad format of the \"" << DICOM_MODALITIES << "\" configuration section";
+throw OrthancException(ErrorCode_BadFileFormat,
-throw OrthancException(ErrorCode_BadFileFormat);
+"Bad format of the \"" + std::string(DICOM_MODALITIES) +
+"\" configuration section");
 }
 Json::Value::Members members = source.getMemberNames();
 for (size_t i = 0; i < members.size(); i++)
 {
 peers_.clear();
 if (source.type() != Json::objectValue)
 {
-LOG(ERROR) << "Bad format of the \"" << ORTHANC_PEERS << "\" configuration section";
+throw OrthancException(ErrorCode_BadFileFormat,
-throw OrthancException(ErrorCode_BadFileFormat);
+"Bad format of the \"" + std::string(ORTHANC_PEERS) +
+"\" configuration section");
 }
 Json::Value::Members members = source.getMemberNames();
 for (size_t i = 0; i < members.size(); i++)
 {
 LoadModalitiesFromJson(modalities);
 }
 else
 {
-LOG(ERROR) << "Cannot unserialize the list of modalities from the Orthanc database";
+throw OrthancException(ErrorCode_InternalError,
-throw OrthancException(ErrorCode_InternalError);
+"Cannot unserialize the list of modalities from the Orthanc database");
 }
 }
 }
 else
 {
 {
 LoadPeersFromJson(peers);
 }
 else
 {
-LOG(ERROR) << "Cannot unserialize the list of peers from the Orthanc database";
+throw OrthancException(ErrorCode_InternalError,
-throw OrthancException(ErrorCode_InternalError);
+"Cannot unserialize the list of peers from the Orthanc database");
 }
 }
 }
 else
 {
 {
 if (json_.isMember(parameter))
 {
 if (json_[parameter].type() != Json::stringValue)
 {
-LOG(ERROR) << "The configuration option \"" << parameter << "\" must be a string";
+throw OrthancException(ErrorCode_BadParameterType,
-throw OrthancException(ErrorCode_BadParameterType);
+"The configuration option \"" + parameter + "\" must be a string");
 }
 else
 {
 return json_[parameter].asString();
 }
 {
 if (json_.isMember(parameter))
 {
 if (json_[parameter].type() != Json::intValue)
 {
-LOG(ERROR) << "The configuration option \"" << parameter << "\" must be an integer";
+throw OrthancException(ErrorCode_BadParameterType,
-throw OrthancException(ErrorCode_BadParameterType);
+"The configuration option \"" + parameter + "\" must be an integer");
 }
 else
 {
 return json_[parameter].asInt();
 }
 {
 int v = GetIntegerParameter(parameter, defaultValue);
 if (v < 0)
 {
-LOG(ERROR) << "The configuration option \"" << parameter << "\" must be a positive integer";
+throw OrthancException(ErrorCode_ParameterOutOfRange,
-throw OrthancException(ErrorCode_ParameterOutOfRange);
+"The configuration option \"" + parameter + "\" must be a positive integer");
 }
 else
 {
 return static_cast<unsigned int>(v);
 }
 {
 if (json_.isMember(parameter))
 {
 if (json_[parameter].type() != Json::booleanValue)
 {
-LOG(ERROR) << "The configuration option \"" << parameter
+throw OrthancException(ErrorCode_BadParameterType,
-<< "\" must be a Boolean (true or false)";
+"The configuration option \"" + parameter +
-throw OrthancException(ErrorCode_BadParameterType);
+"\" must be a Boolean (true or false)");
 }
 else
 {
 return json_[parameter].asBool();
 }
 {
 Modalities::const_iterator found = modalities_.find(name);
 if (found == modalities_.end())
 {
-LOG(ERROR) << "No modality with symbolic name: " << name;
+throw OrthancException(ErrorCode_InexistentItem,
-throw OrthancException(ErrorCode_InexistentItem);
+"No modality with symbolic name: " + name);
 }
 else
 {
 modality = found->second;
 }
 }
 const Json::Value& users = json_["RegisteredUsers"];
 if (users.type() != Json::objectValue)
 {
-LOG(ERROR) << "Badly formatted list of users";
+throw OrthancException(ErrorCode_BadFileFormat, "Badly formatted list of users");
-throw OrthancException(ErrorCode_BadFileFormat);
 }
 Json::Value::Members usernames = users.getMemberNames();
 for (size_t i = 0; i < usernames.size(); i++)
 {
 const Json::Value& lst = json_[key];
 if (lst.type() != Json::arrayValue)
 {
-LOG(ERROR) << "Badly formatted list of strings";
+throw OrthancException(ErrorCode_BadFileFormat, "Badly formatted list of strings");
-throw OrthancException(ErrorCode_BadFileFormat);
 }
 for (Json::Value::ArrayIndex i = 0; i < lst.size(); i++)
 {
 target.push_back(lst[i].asString());
 {
 return modality;
 }
 else
 {
-LOG(ERROR) << "Unknown modality for AET: " << aet;
+throw OrthancException(ErrorCode_InexistentItem,
-throw OrthancException(ErrorCode_InexistentItem);
+"Unknown modality for AET: " + aet);
 }
 }
 void OrthancConfiguration::UpdateModality(const std::string& symbolicName,

Mercurial > hg > orthanc

comparison OrthancServer/OrthancConfiguration.cpp @ 2956:bfee0b9f3209