Mercurial > hg > orthanc

comparison OrthancServer/OrthancInitialization.cpp @ 2202:9b373b7d6713

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix handling of encodings in C-FIND requests
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 08 Dec 2016 12:45:06 +0100
parents 8cbb55089a1d
children 4f39ab2cb453
comparison
equal deleted inserted replaced
2201:307365d0991a 2202:9b373b7d6713
1109 // By default, Latin1 encoding is assumed 1109 // By default, Latin1 encoding is assumed
1110 return s.empty() ? Encoding_Latin1 : StringToEncoding(s.c_str()); 1110 return s.empty() ? Encoding_Latin1 : StringToEncoding(s.c_str());
1111 } 1111 }
1112 1112
1113 1113
1114 void Configuration::SetDefaultEncoding(Encoding encoding)
1115 {
1116 std::string name = EnumerationToString(encoding);
1117
1118 {
1119 boost::recursive_mutex::scoped_lock lock(globalMutex_);
1120 configuration_["DefaultEncoding"] = name;
1121 }
1122
1123 LOG(INFO) << "Default encoding was changed to: " << name;
1124 }
1125
1126
1114 bool Configuration::HasConfigurationChanged() 1127 bool Configuration::HasConfigurationChanged()
1115 { 1128 {
1116 Json::Value starting; 1129 Json::Value starting;
1117 GetConfiguration(starting); 1130 GetConfiguration(starting);
1118 1131