changeset 5689:c14776d25491 find-refactoring

simplification
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Jul 2024 15:56:53 +0200
parents d0a264b803f1
children 708952bd869c
files OrthancServer/Sources/ResourceFinder.cpp OrthancServer/Sources/ResourceFinder.h
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/Sources/ResourceFinder.cpp	Tue Jul 09 15:36:28 2024 +0200
+++ b/OrthancServer/Sources/ResourceFinder.cpp	Tue Jul 09 15:56:53 2024 +0200
@@ -132,9 +132,9 @@
 
 
   SeriesStatus ResourceFinder::GetSeriesStatus(uint32_t& expectedNumberOfInstances,
-                                               const FindResponse::Resource& resource) const
+                                               const FindResponse::Resource& resource)
   {
-    if (request_.GetLevel() != ResourceType_Series)
+    if (resource.GetLevel() != ResourceType_Series)
     {
       throw OrthancException(ErrorCode_BadParameterType);
     }
@@ -194,7 +194,7 @@
   {
     /**
      * This method closely follows "SerializeExpandedResource()" in
-     * "ServerContext.cpp" from Orthanc 1.12.3.
+     * "ServerContext.cpp" from Orthanc 1.12.4.
      **/
 
     if (resource.GetLevel() != request_.GetLevel())
--- a/OrthancServer/Sources/ResourceFinder.h	Tue Jul 09 15:36:28 2024 +0200
+++ b/OrthancServer/Sources/ResourceFinder.h	Tue Jul 09 15:56:53 2024 +0200
@@ -83,8 +83,8 @@
                                         const FindResponse::Resource& resource,
                                         ResourceType level) const;
 
-    SeriesStatus GetSeriesStatus(uint32_t& expectedNumberOfInstances,
-                                 const FindResponse::Resource& resource) const;
+    static SeriesStatus GetSeriesStatus(uint32_t& expectedNumberOfInstances,
+                                        const FindResponse::Resource& resource);
 
     void InjectComputedTags(DicomMap& requestedTags,
                             const FindResponse::Resource& resource) const;