Mercurial > hg > orthanc
diff Plugins/Engine/OrthancPlugins.cpp @ 2256:de1ba22fd28a
simplification wrt. modality manufacturers
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 01 Feb 2017 16:26:57 +0100 |
parents | a3a65de1840f |
children | ce5c13b95dac |
line wrap: on
line diff
--- a/Plugins/Engine/OrthancPlugins.cpp Wed Feb 01 14:04:24 2017 +0000 +++ b/Plugins/Engine/OrthancPlugins.cpp Wed Feb 01 16:26:57 2017 +0100 @@ -410,14 +410,13 @@ ParsedDicomFile& query, const std::string& remoteIp, const std::string& remoteAet, - const std::string& calledAet) + const std::string& calledAet, + ModalityManufacturer manufacturer) { - bool caseSensitivePN = Configuration::GetGlobalBoolParameter("CaseSensitivePN", false); - { boost::mutex::scoped_lock lock(that_.pimpl_->worklistCallbackMutex_); - matcher_.reset(new HierarchicalMatcher(query, caseSensitivePN)); + matcher_.reset(new HierarchicalMatcher(query)); currentQuery_ = &query; if (that_.pimpl_->worklistCallback_) @@ -502,7 +501,8 @@ const std::list<DicomTag>& sequencesToReturn, const std::string& remoteIp, const std::string& remoteAet, - const std::string& calledAet) + const std::string& calledAet, + ModalityManufacturer manufacturer) { DicomMap tmp; tmp.Assign(input); @@ -2598,8 +2598,7 @@ const _OrthancPluginCreateFindMatcher& p = *reinterpret_cast<const _OrthancPluginCreateFindMatcher*>(parameters); ParsedDicomFile query(p.query, p.size); - *(p.target) = reinterpret_cast<OrthancPluginFindMatcher*> - (new HierarchicalMatcher(query, Configuration::GetGlobalBoolParameter("CaseSensitivePN", false))); + *(p.target) = reinterpret_cast<OrthancPluginFindMatcher*>(new HierarchicalMatcher(query)); return true; }