Mercurial > hg > orthanc

comparison OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 4899:3ab57510f6dd proto-filter-instance-returning-error-code

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 df4a90a65af9
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.
552 { 541 {
553 std::unique_ptr<DicomInstanceToStore> toStore(DicomInstanceToStore::CreateFromParsedDicomFile(dicom)); 542 std::unique_ptr<DicomInstanceToStore> toStore(DicomInstanceToStore::CreateFromParsedDicomFile(dicom));
554 toStore->SetOrigin(DicomInstanceOrigin::FromRest(call)); 543 toStore->SetOrigin(DicomInstanceOrigin::FromRest(call));
555 544
556 ServerContext& context = OrthancRestApi::GetContext(call); 545 ServerContext& context = OrthancRestApi::GetContext(call);
557 StoreStatus status = context.Store(id, *toStore, StoreInstanceMode_Default); 546 ServerContext::StoreResult result = context.Store(id, *toStore, StoreInstanceMode_Default);
558 547
559 if (status == StoreStatus_Failure) 548 if (result.GetStatus() == StoreStatus_Failure)
560 { 549 {
561 throw OrthancException(ErrorCode_CannotStoreInstance); 550 throw OrthancException(ErrorCode_CannotStoreInstance);
562 } 551 }
563 552
564 if (sendAnswer) 553 if (sendAnswer)
565 { 554 {
566 OrthancRestApi::GetApi(call).AnswerStoredInstance(call, *toStore, status, id); 555 OrthancRestApi::GetApi(call).AnswerStoredInstance(call, *toStore, result.GetStatus(), id);
567 } 556 }
568 } 557 }
569 558
570 559
571 static void CreateDicomV1(ParsedDicomFile& dicom, 560 static void CreateDicomV1(ParsedDicomFile& dicom,