# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1604055616 -3600
# Node ID 97c8a7f9380528f9f2f8b2ab3738b505714112f9
# Parent  f9eaf14d3d1989b6f0899d9d1e9dcf87a2bebb49# Parent  d31cba1e27ac9e915c7982363b5700f4ee26e116
merge

diff -r f9eaf14d3d19 -r 97c8a7f93805 OrthancServer/Sources/OrthancWebDav.cpp
--- 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();
       }
diff -r f9eaf14d3d19 -r 97c8a7f93805 OrthancServer/Sources/ServerIndex.cpp
--- 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()));
           }
         }
 
diff -r f9eaf14d3d19 -r 97c8a7f93805 OrthancServer/Sources/SliceOrdering.cpp
--- 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;
         }
       }