comparison OrthancServer/main.cpp @ 3713:56f2397f027a storage-commitment

integration mainline->storage-commitment
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 02 Mar 2020 15:42:17 +0100
parents e168a2dedb00 2a170a8f1faf
children 4fc24b69446a
comparison
equal deleted inserted replaced
3711:14b363d972a8 3713:56f2397f027a
188 return new OrthancStoreRequestHandler(context_); 188 return new OrthancStoreRequestHandler(context_);
189 } 189 }
190 190
191 virtual IFindRequestHandler* ConstructFindRequestHandler() 191 virtual IFindRequestHandler* ConstructFindRequestHandler()
192 { 192 {
193 std::auto_ptr<OrthancFindRequestHandler> result(new OrthancFindRequestHandler(context_)); 193 std::unique_ptr<OrthancFindRequestHandler> result(new OrthancFindRequestHandler(context_));
194 194
195 { 195 {
196 OrthancConfiguration::ReaderLock lock; 196 OrthancConfiguration::ReaderLock lock;
197 result->SetMaxResults(lock.GetConfiguration().GetUnsignedIntegerParameter("LimitFindResults", 0)); 197 result->SetMaxResults(lock.GetConfiguration().GetUnsignedIntegerParameter("LimitFindResults", 0));
198 result->SetMaxInstances(lock.GetConfiguration().GetUnsignedIntegerParameter("LimitFindInstances", 0)); 198 result->SetMaxInstances(lock.GetConfiguration().GetUnsignedIntegerParameter("LimitFindInstances", 0));
1359 static bool ConfigurePlugins(int argc, 1359 static bool ConfigurePlugins(int argc,
1360 char* argv[], 1360 char* argv[],
1361 bool upgradeDatabase, 1361 bool upgradeDatabase,
1362 bool loadJobsFromDatabase) 1362 bool loadJobsFromDatabase)
1363 { 1363 {
1364 std::auto_ptr<IDatabaseWrapper> databasePtr; 1364 std::unique_ptr<IDatabaseWrapper> databasePtr;
1365 std::auto_ptr<IStorageArea> storage; 1365 std::unique_ptr<IStorageArea> storage;
1366 1366
1367 #if ORTHANC_ENABLE_PLUGINS == 1 1367 #if ORTHANC_ENABLE_PLUGINS == 1
1368 OrthancPlugins plugins; 1368 OrthancPlugins plugins;
1369 plugins.SetCommandLineArguments(argc, argv); 1369 plugins.SetCommandLineArguments(argc, argv);
1370 LoadPlugins(plugins); 1370 LoadPlugins(plugins);