diff OrthancServer/Sources/Database/FindResponse.cpp @ 5676:b744a2cf408a find-refactoring

shorten ParentRetrieveSpecification/ChildrenRetrieveSpecification as ParentSpecification/ChildrenSpecification
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 06 Jul 2024 15:04:28 +0200
parents 2b65f25cb1c8
children 708952bd869c
line wrap: on
line diff
--- a/OrthancServer/Sources/Database/FindResponse.cpp	Sat Jul 06 15:00:45 2024 +0200
+++ b/OrthancServer/Sources/Database/FindResponse.cpp	Sat Jul 06 15:04:28 2024 +0200
@@ -569,14 +569,14 @@
       if (levels[i] != request.GetLevel() &&
           IsResourceLevelAboveOrEqual(levels[i], request.GetLevel()))
       {
-        if (request.GetParentRetrieveSpecification(levels[i]).IsRetrieveMainDicomTags())
+        if (request.GetParentSpecification(levels[i]).IsRetrieveMainDicomTags())
         {
           DicomMap m;
           GetMainDicomTags(m, levels[i]);
           DebugDicomMap(target[level]["MainDicomTags"], m);
         }
 
-        if (request.GetParentRetrieveSpecification(levels[i]).IsRetrieveMainDicomTags())
+        if (request.GetParentSpecification(levels[i]).IsRetrieveMainDicomTags())
         {
           DebugMetadata(target[level]["Metadata"], GetMetadata(levels[i]));
         }
@@ -585,12 +585,12 @@
       if (levels[i] != request.GetLevel() &&
           IsResourceLevelAboveOrEqual(request.GetLevel(), levels[i]))
       {
-        if (request.GetChildrenRetrieveSpecification(levels[i]).IsRetrieveIdentifiers())
+        if (request.GetChildrenSpecification(levels[i]).IsRetrieveIdentifiers())
         {
           DebugSetOfStrings(target[level]["Identifiers"], GetChildrenInformation(levels[i]).GetIdentifiers());
         }
 
-        const std::set<MetadataType>& metadata = request.GetChildrenRetrieveSpecification(levels[i]).GetMetadata();
+        const std::set<MetadataType>& metadata = request.GetChildrenSpecification(levels[i]).GetMetadata();
         for (std::set<MetadataType>::const_iterator it = metadata.begin(); it != metadata.end(); ++it)
         {
           std::set<std::string> values;
@@ -598,7 +598,7 @@
           DebugSetOfStrings(target[level]["Metadata"][EnumerationToString(*it)], values);
         }
 
-        const std::set<DicomTag>& tags = request.GetChildrenRetrieveSpecification(levels[i]).GetMainDicomTags();
+        const std::set<DicomTag>& tags = request.GetChildrenSpecification(levels[i]).GetMainDicomTags();
         for (std::set<DicomTag>::const_iterator it = tags.begin(); it != tags.end(); ++it)
         {
           std::set<std::string> values;