Mercurial > hg > orthanc

comparison OrthancServer/main.cpp @ 3918:dba48c162b7b c-get

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
C-Get SCP always enabled; no more server config
author Alain Mazy <alain@mazy.be>
date Tue, 12 May 2020 07:50:38 +0200
parents 7a7d18875985
children 82e88ff003d7
comparison
equal deleted inserted replaced
3867:7a7d18875985 3918:dba48c162b7b
1040 static bool StartDicomServer(ServerContext& context, 1040 static bool StartDicomServer(ServerContext& context,
1041 OrthancRestApi& restApi, 1041 OrthancRestApi& restApi,
1042 OrthancPlugins* plugins) 1042 OrthancPlugins* plugins)
1043 { 1043 {
1044 bool dicomServerEnabled; 1044 bool dicomServerEnabled;
1045 bool dicomCGetEnabled;
1046 1045
1047 { 1046 {
1048 OrthancConfiguration::ReaderLock lock; 1047 OrthancConfiguration::ReaderLock lock;
1049 dicomServerEnabled = lock.GetConfiguration().GetBooleanParameter("DicomServerEnabled", true); 1048 dicomServerEnabled = lock.GetConfiguration().GetBooleanParameter("DicomServerEnabled", true);
1050 dicomCGetEnabled = lock.GetConfiguration().GetBooleanParameter("DicomEnableCGet", false);
1051 } 1049 }
1052 1050
1053 if (!dicomServerEnabled) 1051 if (!dicomServerEnabled)
1054 { 1052 {
1055 LOG(WARNING) << "The DICOM server is disabled"; 1053 LOG(WARNING) << "The DICOM server is disabled";
1064 // Setup the DICOM server 1062 // Setup the DICOM server
1065 DicomServer dicomServer; 1063 DicomServer dicomServer;
1066 dicomServer.SetRemoteModalities(modalities); 1064 dicomServer.SetRemoteModalities(modalities);
1067 dicomServer.SetStoreRequestHandlerFactory(serverFactory); 1065 dicomServer.SetStoreRequestHandlerFactory(serverFactory);
1068 dicomServer.SetMoveRequestHandlerFactory(serverFactory); 1066 dicomServer.SetMoveRequestHandlerFactory(serverFactory);
1069 if (dicomCGetEnabled) 1067 dicomServer.SetGetRequestHandlerFactory(serverFactory);
1070 {
1071 dicomServer.SetGetRequestHandlerFactory(serverFactory);
1072 }
1073 dicomServer.SetFindRequestHandlerFactory(serverFactory); 1068 dicomServer.SetFindRequestHandlerFactory(serverFactory);
1074 dicomServer.SetStorageCommitmentRequestHandlerFactory(serverFactory); 1069 dicomServer.SetStorageCommitmentRequestHandlerFactory(serverFactory);
1075 1070
1076 { 1071 {
1077 OrthancConfiguration::ReaderLock lock; 1072 OrthancConfiguration::ReaderLock lock;