diff OrthancServer/Sources/OrthancWebDav.cpp @ 4554:efd90f778cd2 db-changes

simplification
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 03 Mar 2021 16:31:57 +0100
parents 350a22c094f2
children 94147ce2f097
line wrap: on
line diff
--- a/OrthancServer/Sources/OrthancWebDav.cpp	Wed Mar 03 13:44:01 2021 +0100
+++ b/OrthancServer/Sources/OrthancWebDav.cpp	Wed Mar 03 16:31:57 2021 +0100
@@ -268,10 +268,8 @@
                        const DicomMap& mainDicomTags,
                        const Json::Value* dicomAsJson  /* unused (*) */)  ORTHANC_OVERRIDE
     {
-      ServerIndex::ExpandResourceOperation operation(publicId, level_);
-      context_.GetIndex().Apply(operation);
-
-      if (operation.IsFound())
+      Json::Value resource;
+      if (context_.GetIndex().ExpandResource(resource, publicId, level_))
       {
         if (success_)
         {
@@ -279,7 +277,7 @@
         }
         else
         {
-          target_ = operation.GetResource().toStyledString();
+          target_ = resource.toStyledString();
 
           // Replace UNIX newlines with DOS newlines 
           boost::replace_all(target_, "\n", "\r\n");