# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1720199903 -7200
# Node ID f690568f03255630f39d6b7b84594ec398fa4547
# Parent  d77292629430ef79d7c44108d2d7e0ec161d42f8
Fix C-Find queries not returning computed tags in very specific use-cases

diff -r d77292629430 -r f690568f0325 NEWS
--- a/NEWS	Wed Jul 03 17:50:59 2024 +0200
+++ b/NEWS	Fri Jul 05 19:18:23 2024 +0200
@@ -17,6 +17,9 @@
   DB plugins that are implementing the UpdateAndGetStatistics function (currently only
   PostgreSQL).  This avoids very long update times in case you don't call /statistics
   for a long period.
+* Fix C-Find queries not returning computed tags like ModalitiesInStudy, NumberOfStudyRelatedSeries, ...
+  in very specific use-cases.
+
 
 
 Version 1.12.4 (2024-06-05)
diff -r d77292629430 -r f690568f0325 OrthancServer/Sources/ServerContext.cpp
--- a/OrthancServer/Sources/ServerContext.cpp	Wed Jul 03 17:50:59 2024 +0200
+++ b/OrthancServer/Sources/ServerContext.cpp	Fri Jul 05 19:18:23 2024 +0200
@@ -2578,7 +2578,13 @@
       Toolbox::GetMissingsFromSet(missingTags, requestedTags, retrievedTags);
 
       // if all possible tags have been read, no need to get them from DB anymore
-      if (missingTags.size() == 0 || DicomMap::HasOnlyComputedTags(missingTags))
+      if (missingTags.size() > 0 && DicomMap::HasOnlyComputedTags(missingTags))
+      {
+        resource.missingRequestedTags_ = missingTags;
+        ComputeTags(resource, *this, publicId, level, requestedTags);
+        return true;
+      }
+      else if (missingTags.size() == 0)
       {
         expandFlags = static_cast<ExpandResourceFlags>(expandFlags & ~ExpandResourceFlags_IncludeMainDicomTags);
       }