Mercurial > hg > orthanc
comparison OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp @ 4785:61da49321754 openssl-3.x
integration mainline->openssl-3.x
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 30 Aug 2021 22:21:24 +0200 |
parents | f0038043fb97 71fbdee4b832 |
children | 70d2a97ca8cb |
comparison
equal
deleted
inserted
replaced
4760:b2417ac5055a | 4785:61da49321754 |
---|---|
197 { | 197 { |
198 if (e.GetErrorCode() == ErrorCode_BadFileFormat) | 198 if (e.GetErrorCode() == ErrorCode_BadFileFormat) |
199 { | 199 { |
200 LOG(ERROR) << "Cannot import non-DICOM file from ZIP archive: " << filename; | 200 LOG(ERROR) << "Cannot import non-DICOM file from ZIP archive: " << filename; |
201 } | 201 } |
202 else if (e.GetErrorCode() == ErrorCode_InexistentTag) | |
203 { | |
204 /** | |
205 * Allow upload of ZIP archives containing a DICOMDIR | |
206 * file (new in Orthanc 1.9.7): | |
207 * https://groups.google.com/g/orthanc-users/c/sgBU89o4nhU/m/kbRAYiQUAAAJ | |
208 **/ | |
209 LOG(ERROR) << "Ignoring what is probably a DICOMDIR file within a ZIP archive: \"" << filename << "\""; | |
210 } | |
202 else | 211 else |
203 { | 212 { |
204 throw; | 213 throw; |
205 } | 214 } |
206 } | 215 } |