Mercurial > hg > orthanc
diff OrthancServer/OrthancFindRequestHandler.cpp @ 2943:9f6716008066
merge
author | am@osimis.io |
---|---|
date | Thu, 29 Nov 2018 15:26:47 +0100 |
parents | 4767d36679ed |
children | bbfd95a0c429 |
line wrap: on
line diff
--- a/OrthancServer/OrthancFindRequestHandler.cpp Thu Nov 29 15:26:31 2018 +0100 +++ b/OrthancServer/OrthancFindRequestHandler.cpp Thu Nov 29 15:26:47 2018 +0100 @@ -38,7 +38,7 @@ #include "../Core/Lua/LuaFunctionCall.h" #include "../Core/Logging.h" #include "../Core/DicomParsing/FromDcmtkBridge.h" -#include "OrthancInitialization.h" +#include "OrthancConfiguration.h" #include "Search/LookupResource.h" #include "ServerToolbox.h" @@ -258,16 +258,21 @@ // The metadata "SopClassUid" is available for each of these instances StoreSetOfStrings(result, DICOM_TAG_SOP_CLASSES_IN_STUDY, values); } - else if (Configuration::GetGlobalBoolParameter("AllowFindSopClassesInStudy", false)) - { - ExtractTagFromInstancesOnDisk(values, context, DICOM_TAG_SOP_CLASS_UID, instances); - StoreSetOfStrings(result, DICOM_TAG_SOP_CLASSES_IN_STUDY, values); - } else { - result.SetValue(DICOM_TAG_SOP_CLASSES_IN_STUDY, "", false); - LOG(WARNING) << "The handling of \"SOP Classes in Study\" (0008,0062) " - << "in C-FIND requests is disabled"; + OrthancConfiguration::ReaderLock lock; + + if (lock.GetConfiguration().GetBooleanParameter("AllowFindSopClassesInStudy", false)) + { + ExtractTagFromInstancesOnDisk(values, context, DICOM_TAG_SOP_CLASS_UID, instances); + StoreSetOfStrings(result, DICOM_TAG_SOP_CLASSES_IN_STUDY, values); + } + else + { + result.SetValue(DICOM_TAG_SOP_CLASSES_IN_STUDY, "", false); + LOG(WARNING) << "The handling of \"SOP Classes in Study\" (0008,0062) " + << "in C-FIND requests is disabled"; + } } } } @@ -590,7 +595,12 @@ LookupResource lookup(level); - const bool caseSensitivePN = Configuration::GetGlobalBoolParameter("CaseSensitivePN", false); + bool caseSensitivePN; + + { + OrthancConfiguration::ReaderLock lock; + caseSensitivePN = lock.GetConfiguration().GetBooleanParameter("CaseSensitivePN", false); + } for (size_t i = 0; i < query.GetSize(); i++) {