Mercurial > hg > orthanc

comparison Plugins/Engine/OrthancPlugins.cpp @ 2256:de1ba22fd28a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplification wrt. modality manufacturers
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 01 Feb 2017 16:26:57 +0100
parents a3a65de1840f
children ce5c13b95dac
comparison
equal deleted inserted replaced
2255:1442da6a03dd 2256:de1ba22fd28a
408 408
409 virtual void Handle(DicomFindAnswers& answers, 409 virtual void Handle(DicomFindAnswers& answers,
410 ParsedDicomFile& query, 410 ParsedDicomFile& query,
411 const std::string& remoteIp, 411 const std::string& remoteIp,
412 const std::string& remoteAet, 412 const std::string& remoteAet,
413 const std::string& calledAet) 413 const std::string& calledAet,
414 { 414 ModalityManufacturer manufacturer)
415 bool caseSensitivePN = Configuration::GetGlobalBoolParameter("CaseSensitivePN", false); 415 {
416
417 { 416 {
418 boost::mutex::scoped_lock lock(that_.pimpl_->worklistCallbackMutex_); 417 boost::mutex::scoped_lock lock(that_.pimpl_->worklistCallbackMutex_);
419 418
420 matcher_.reset(new HierarchicalMatcher(query, caseSensitivePN)); 419 matcher_.reset(new HierarchicalMatcher(query));
421 currentQuery_ = &query; 420 currentQuery_ = &query;
422 421
423 if (that_.pimpl_->worklistCallback_) 422 if (that_.pimpl_->worklistCallback_)
424 { 423 {
425 OrthancPluginErrorCode error = that_.pimpl_->worklistCallback_ 424 OrthancPluginErrorCode error = that_.pimpl_->worklistCallback_
500 virtual void Handle(DicomFindAnswers& answers, 499 virtual void Handle(DicomFindAnswers& answers,
501 const DicomMap& input, 500 const DicomMap& input,
502 const std::list<DicomTag>& sequencesToReturn, 501 const std::list<DicomTag>& sequencesToReturn,
503 const std::string& remoteIp, 502 const std::string& remoteIp,
504 const std::string& remoteAet, 503 const std::string& remoteAet,
505 const std::string& calledAet) 504 const std::string& calledAet,
505 ModalityManufacturer manufacturer)
506 { 506 {
507 DicomMap tmp; 507 DicomMap tmp;
508 tmp.Assign(input); 508 tmp.Assign(input);
509 509
510 for (std::list<DicomTag>::const_iterator it = sequencesToReturn.begin(); 510 for (std::list<DicomTag>::const_iterator it = sequencesToReturn.begin();
2596 case _OrthancPluginService_CreateFindMatcher: 2596 case _OrthancPluginService_CreateFindMatcher:
2597 { 2597 {
2598 const _OrthancPluginCreateFindMatcher& p = 2598 const _OrthancPluginCreateFindMatcher& p =
2599 *reinterpret_cast<const _OrthancPluginCreateFindMatcher*>(parameters); 2599 *reinterpret_cast<const _OrthancPluginCreateFindMatcher*>(parameters);
2600 ParsedDicomFile query(p.query, p.size); 2600 ParsedDicomFile query(p.query, p.size);
2601 *(p.target) = reinterpret_cast<OrthancPluginFindMatcher*> 2601 *(p.target) = reinterpret_cast<OrthancPluginFindMatcher*>(new HierarchicalMatcher(query));
2602 (new HierarchicalMatcher(query, Configuration::GetGlobalBoolParameter("CaseSensitivePN", false)));
2603 return true; 2602 return true;
2604 } 2603 }
2605 2604
2606 case _OrthancPluginService_FreeFindMatcher: 2605 case _OrthancPluginService_FreeFindMatcher:
2607 { 2606 {