Mercurial > hg > orthanc

comparison OrthancServer/Sources/ServerContext.cpp @ 5670:56859a7ffa99 find-refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->find-refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 06 Jul 2024 01:04:25 +0200
parents 3f13db27b399 f690568f0325
children fd4c5e064cbe
comparison
equal deleted inserted replaced
5668:bd1352bd9d82 5670:56859a7ffa99
2606 resource.GetMainDicomTags().GetTags(retrievedTags); 2606 resource.GetMainDicomTags().GetTags(retrievedTags);
2607 2607
2608 Toolbox::GetMissingsFromSet(missingTags, requestedTags, retrievedTags); 2608 Toolbox::GetMissingsFromSet(missingTags, requestedTags, retrievedTags);
2609 2609
2610 // if all possible tags have been read, no need to get them from DB anymore 2610 // if all possible tags have been read, no need to get them from DB anymore
2611 if (missingTags.size() == 0 || DicomMap::HasOnlyComputedTags(missingTags)) 2611 if (missingTags.size() > 0 && DicomMap::HasOnlyComputedTags(missingTags))
2612 {
2613 resource.missingRequestedTags_ = missingTags;
2614 ComputeTags(resource, *this, publicId, level, requestedTags);
2615 return true;
2616 }
2617 else if (missingTags.size() == 0)
2612 { 2618 {
2613 expandFlags = static_cast<ExpandResourceFlags>(expandFlags & ~ExpandResourceFlags_IncludeMainDicomTags); 2619 expandFlags = static_cast<ExpandResourceFlags>(expandFlags & ~ExpandResourceFlags_IncludeMainDicomTags);
2614 } 2620 }
2615 2621
2616 if (missingTags.size() == 0 && expandFlags == ExpandResourceFlags_None) // we have already retrieved anything we need 2622 if (missingTags.size() == 0 && expandFlags == ExpandResourceFlags_None) // we have already retrieved anything we need