# HG changeset patch # User Sebastien Jodogne # Date 1720533413 -7200 # Node ID c14776d2549179a6ee5313e4c68f6b01f32230d6 # Parent d0a264b803f13e6b6d949fbc59c19d7fab5c0fdf simplification diff -r d0a264b803f1 -r c14776d25491 OrthancServer/Sources/ResourceFinder.cpp --- 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()) diff -r d0a264b803f1 -r c14776d25491 OrthancServer/Sources/ResourceFinder.h --- 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;