Mercurial > hg > orthanc

comparison OrthancServer/main.cpp @ 3920:82e88ff003d7 c-get

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default -> c-get
author Alain Mazy <alain@mazy.be>
date Tue, 12 May 2020 14:58:24 +0200
parents dba48c162b7b e1c2bc9a5cc1
children 16978ee28588
comparison
equal deleted inserted replaced
3918:dba48c162b7b 3920:82e88ff003d7
87 toStore.SetBuffer(dicomFile.c_str(), dicomFile.size()); 87 toStore.SetBuffer(dicomFile.c_str(), dicomFile.size());
88 toStore.SetSummary(dicomSummary); 88 toStore.SetSummary(dicomSummary);
89 toStore.SetJson(dicomJson); 89 toStore.SetJson(dicomJson);
90 90
91 std::string id; 91 std::string id;
92 context_.Store(id, toStore); 92 context_.Store(id, toStore, StoreInstanceMode_Default);
93 } 93 }
94 } 94 }
95 }; 95 };
96 96
97 97
1297 // value (DEFAULT_HTTP_TIMEOUT = 60 seconds in Orthanc 1.5.7) 1297 // value (DEFAULT_HTTP_TIMEOUT = 60 seconds in Orthanc 1.5.7)
1298 HttpClient::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("HttpTimeout", 0)); 1298 HttpClient::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("HttpTimeout", 0));
1299 1299
1300 HttpClient::SetDefaultProxy(lock.GetConfiguration().GetStringParameter("HttpProxy", "")); 1300 HttpClient::SetDefaultProxy(lock.GetConfiguration().GetStringParameter("HttpProxy", ""));
1301 1301
1302 DicomUserConnection::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("DicomScuTimeout", 10));
1303 DicomAssociationParameters::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("DicomScuTimeout", 10)); 1302 DicomAssociationParameters::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("DicomScuTimeout", 10));
1304 1303
1305 maxCompletedJobs = lock.GetConfiguration().GetUnsignedIntegerParameter("JobsHistorySize", 10); 1304 maxCompletedJobs = lock.GetConfiguration().GetUnsignedIntegerParameter("JobsHistorySize", 10);
1306 1305
1307 if (maxCompletedJobs == 0) 1306 if (maxCompletedJobs == 0)
1317 1316
1318 context.SetCompressionEnabled(lock.GetConfiguration().GetBooleanParameter("StorageCompression", false)); 1317 context.SetCompressionEnabled(lock.GetConfiguration().GetBooleanParameter("StorageCompression", false));
1319 context.SetStoreMD5ForAttachments(lock.GetConfiguration().GetBooleanParameter("StoreMD5ForAttachments", true)); 1318 context.SetStoreMD5ForAttachments(lock.GetConfiguration().GetBooleanParameter("StoreMD5ForAttachments", true));
1320 1319
1321 // New option in Orthanc 1.4.2 1320 // New option in Orthanc 1.4.2
1322 context.GetIndex().SetOverwriteInstances(lock.GetConfiguration().GetBooleanParameter("OverwriteInstances", false)); 1321 context.SetOverwriteInstances(lock.GetConfiguration().GetBooleanParameter("OverwriteInstances", false));
1323 1322
1324 try 1323 try
1325 { 1324 {
1326 context.GetIndex().SetMaximumPatientCount(lock.GetConfiguration().GetUnsignedIntegerParameter("MaximumPatientCount", 0)); 1325 context.GetIndex().SetMaximumPatientCount(lock.GetConfiguration().GetUnsignedIntegerParameter("MaximumPatientCount", 0));
1327 } 1326 }