Mercurial > hg > orthanc

changeset 5694:4a85ee2cbe1f find-refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 12 Jul 2024 07:59:00 +0200
parents 023787ecaff2
children 380a71e0d7e7
files OrthancServer/Sources/ResourceFinder.cpp
diffstat 1 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/Sources/ResourceFinder.cpp	Thu Jul 11 21:37:20 2024 +0200
+++ b/OrthancServer/Sources/ResourceFinder.cpp	Fri Jul 12 07:59:00 2024 +0200
@@ -562,6 +562,8 @@
 
   void ResourceFinder::SetDatabaseLookup(const DatabaseLookup& lookup)
   {
+    MainDicomTagsRegistry registry;
+
     lookup_.reset(lookup.Clone());
 
     for (size_t i = 0; i < lookup.GetConstraintsCount(); i++)
@@ -571,9 +573,18 @@
       {
         AddRequestedTag(tag);
       }
+      else
+      {
+        ResourceType level;
+        DicomTagType tagType;
+        registry.LookupTag(level, tagType, tag);
+        if (tagType == DicomTagType_Generic)
+        {
+          AddRequestedTag(tag);
+        }
+      }
     }
 
-    MainDicomTagsRegistry registry;
     isSimpleLookup_ = registry.NormalizeLookup(request_.GetDicomTagConstraints(), lookup, request_.GetLevel());
 
     // "request_.GetDicomTagConstraints()" only contains constraints on main DICOM tags