# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1628869269 -7200
# Node ID 71fbdee4b8326ddbab9b327b5cdde7894ec38bb7
# Parent  cc02a2aa8bab68cf6204bde9207cf30b854a76d0
Fix upload of ZIP archives containing a DICOMDIR file

diff -r cc02a2aa8bab -r 71fbdee4b832 NEWS
--- a/NEWS	Mon Aug 09 08:50:04 2021 +0200
+++ b/NEWS	Fri Aug 13 17:41:09 2021 +0200
@@ -3,6 +3,7 @@
 
 * Added file CITATION.cff
 * Linux Standard Base (LSB) builds of Orthanc can load non-LSB builds of plugins
+* Fix upload of ZIP archives containing a DICOMDIR file
 
 
 Version 1.9.6 (2021-07-21)
diff -r cc02a2aa8bab -r 71fbdee4b832 OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp
--- a/OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp	Mon Aug 09 08:50:04 2021 +0200
+++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp	Fri Aug 13 17:41:09 2021 +0200
@@ -211,6 +211,15 @@
             {
               LOG(ERROR) << "Cannot import non-DICOM file from ZIP archive: " << filename;
             }
+            else if (e.GetErrorCode() == ErrorCode_InexistentTag)
+            {
+              /**
+               * Allow upload of ZIP archives containing a DICOMDIR
+               * file (new in Orthanc 1.9.7):
+               * https://groups.google.com/g/orthanc-users/c/sgBU89o4nhU/m/kbRAYiQUAAAJ
+               **/
+              LOG(ERROR) << "Ignoring what is probably a DICOMDIR file within a ZIP archive: \"" << filename << "\"";
+            }
             else
             {
               throw;