Mercurial > hg > orthanc
comparison OrthancServer/Sources/OrthancWebDav.cpp @ 4899:3ab57510f6dd proto-filter-instance-returning-error-code
integration mainline->proto-filter-instance-returning-error-code
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Sun, 20 Feb 2022 12:59:30 +0100 |
parents | 6eff25f70121 |
children | acd3f72e2a21 |
comparison
equal
deleted
inserted
replaced
4791:656784ac6759 | 4899:3ab57510f6dd |
---|---|
1 /** | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
4 * Department, University Hospital of Liege, Belgium | 4 * Department, University Hospital of Liege, Belgium |
5 * Copyright (C) 2017-2021 Osimis S.A., Belgium | 5 * Copyright (C) 2017-2022 Osimis S.A., Belgium |
6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium | |
6 * | 7 * |
7 * This program is free software: you can redistribute it and/or | 8 * This program is free software: you can redistribute it and/or |
8 * modify it under the terms of the GNU General Public License as | 9 * modify it under the terms of the GNU General Public License as |
9 * published by the Free Software Foundation, either version 3 of the | 10 * published by the Free Software Foundation, either version 3 of the |
10 * License, or (at your option) any later version. | 11 * License, or (at your option) any later version. |
11 * | |
12 * In addition, as a special exception, the copyright holders of this | |
13 * program give permission to link the code of its release with the | |
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
15 * that use the same license as the "OpenSSL" library), and distribute | |
16 * the linked executables. You must obey the GNU General Public License | |
17 * in all respects for all of the code used other than "OpenSSL". If you | |
18 * modify file(s) with this exception, you may extend this exception to | |
19 * your version of the file(s), but you are not obligated to do so. If | |
20 * you do not wish to do so, delete this exception statement from your | |
21 * version. If you delete this exception statement from all source files | |
22 * in the program, then also delete it here. | |
23 * | 12 * |
24 * This program is distributed in the hope that it will be useful, but | 13 * This program is distributed in the hope that it will be useful, but |
25 * WITHOUT ANY WARRANTY; without even the implied warranty of | 14 * WITHOUT ANY WARRANTY; without even the implied warranty of |
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
27 * General Public License for more details. | 16 * General Public License for more details. |
1311 instance->SetOrigin(DicomInstanceOrigin::FromWebDav()); | 1300 instance->SetOrigin(DicomInstanceOrigin::FromWebDav()); |
1312 | 1301 |
1313 try | 1302 try |
1314 { | 1303 { |
1315 std::string publicId; | 1304 std::string publicId; |
1316 StoreStatus status = context_.Store(publicId, *instance, StoreInstanceMode_Default); | 1305 ServerContext::StoreResult result = context_.Store(publicId, *instance, StoreInstanceMode_Default); |
1317 if (status == StoreStatus_Success || | 1306 if (result.GetStatus() == StoreStatus_Success || |
1318 status == StoreStatus_AlreadyStored) | 1307 result.GetStatus() == StoreStatus_AlreadyStored) |
1319 { | 1308 { |
1320 LOG(INFO) << "Successfully imported DICOM instance from WebDAV: " | 1309 LOG(INFO) << "Successfully imported DICOM instance from WebDAV: " |
1321 << path << " (Orthanc ID: " << publicId << ")"; | 1310 << path << " (Orthanc ID: " << publicId << ")"; |
1322 success = true; | 1311 success = true; |
1323 } | 1312 } |