Mercurial > hg > orthanc

comparison OrthancServer/DicomProtocol/DicomUserConnection.cpp @ 2352:3ab96768d144

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix issue #52 (DICOM level security association problems)
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 18 Jul 2017 17:33:26 +0200
parents b5a04d983647
children b8969010b534
comparison
equal deleted inserted replaced
2351:56504f89d4ac 2352:3ab96768d144
494 // https://bitbucket.org/sjodogne/orthanc/issues/31/ 494 // https://bitbucket.org/sjodogne/orthanc/issues/31/
495 495
496 switch (manufacturer) 496 switch (manufacturer)
497 { 497 {
498 case ModalityManufacturer_GenericNoWildcardInDates: 498 case ModalityManufacturer_GenericNoWildcardInDates:
499 case ModalityManufacturer_GenericNoWildcards: 499 case ModalityManufacturer_GenericNoUniversalWildcard:
500 { 500 {
501 std::auto_ptr<DicomMap> fix(fields.Clone()); 501 std::auto_ptr<DicomMap> fix(fields.Clone());
502 502
503 std::set<DicomTag> tags; 503 std::set<DicomTag> tags;
504 fix->GetTags(tags); 504 fix->GetTags(tags);
506 for (std::set<DicomTag>::const_iterator it = tags.begin(); it != tags.end(); ++it) 506 for (std::set<DicomTag>::const_iterator it = tags.begin(); it != tags.end(); ++it)
507 { 507 {
508 // Replace a "*" wildcard query by an empty query ("") for 508 // Replace a "*" wildcard query by an empty query ("") for
509 // "date" or "all" value representations depending on the 509 // "date" or "all" value representations depending on the
510 // type of manufacturer. 510 // type of manufacturer.
511 if (manufacturer == ModalityManufacturer_GenericNoWildcards || 511 if (manufacturer == ModalityManufacturer_GenericNoUniversalWildcard ||
512 (manufacturer == ModalityManufacturer_GenericNoWildcardInDates && 512 (manufacturer == ModalityManufacturer_GenericNoWildcardInDates &&
513 FromDcmtkBridge::LookupValueRepresentation(*it) == ValueRepresentation_Date)) 513 FromDcmtkBridge::LookupValueRepresentation(*it) == ValueRepresentation_Date))
514 { 514 {
515 const DicomValue* value = fix->TestAndGetValue(*it); 515 const DicomValue* value = fix->TestAndGetValue(*it);
516 516