Mercurial > hg > orthanc

changeset 4266:97c8a7f93805

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 30 Oct 2020 12:00:16 +0100
parents f9eaf14d3d19 (current diff) d31cba1e27ac (diff)
children a20928107a90
files
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/Sources/OrthancWebDav.cpp	Fri Oct 30 12:00:06 2020 +0100
+++ b/OrthancServer/Sources/OrthancWebDav.cpp	Fri Oct 30 12:00:16 2020 +0100
@@ -1245,7 +1245,7 @@
          * just-created folders before the remote WebDAV has time to
          * write files into it.
          **/
-        LOG(INFO) << "Cleaning up the empty WebDAV upload folders";
+        VLOG(1) << "Cleaning up the empty WebDAV upload folders";
         that->uploads_.RemoveEmptyFolders();
         lastModification = GetNow();
       }
--- a/OrthancServer/Sources/ServerIndex.cpp	Fri Oct 30 12:00:06 2020 +0100
+++ b/OrthancServer/Sources/ServerIndex.cpp	Fri Oct 30 12:00:16 2020 +0100
@@ -977,7 +977,7 @@
               !value->IsBinary())
           {
             SetInstanceMetadata(content, instanceMetadata, instanceId,
-                                MetadataType_Instance_IndexInSeries, value->GetContent());
+                                MetadataType_Instance_IndexInSeries, Toolbox::StripSpaces(value->GetContent()));
           }
         }
 
--- a/OrthancServer/Sources/SliceOrdering.cpp	Fri Oct 30 12:00:06 2020 +0100
+++ b/OrthancServer/Sources/SliceOrdering.cpp	Fri Oct 30 12:00:16 2020 +0100
@@ -210,7 +210,7 @@
       {
         if (index.LookupMetadata(s, instanceId, MetadataType_Instance_IndexInSeries))
         {
-          indexInSeries_ = boost::lexical_cast<size_t>(s);
+          indexInSeries_ = boost::lexical_cast<size_t>(Toolbox::StripSpaces(s));
           hasIndexInSeries_ = true;
         }
       }