Mercurial > hg > orthanc
annotate Resources/Graveyard/OldScheduler/ModifyInstanceCommand.cpp @ 2665:389d050a2e66 jobs
fix deadlock, speed up unit tests
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 08 Jun 2018 13:51:31 +0200 |
| parents | 3ff4c50647ea |
| children | 4e43e67f8ecf |
| rev | line source |
|---|---|
| 1008 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1099
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
|
2447
878b59270859
upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium |
| 1008 | 6 * |
| 7 * 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 * published by the Free Software Foundation, either version 3 of the | |
| 10 * 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 * | |
| 24 * This program is distributed in the hope that it will be useful, but | |
| 25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 27 * General Public License for more details. | |
| 28 * | |
| 29 * You should have received a copy of the GNU General Public License | |
| 30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 31 **/ | |
| 32 | |
| 33 | |
|
1624
0a2ad4a6858f
fix missing precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1572
diff
changeset
|
34 #include "../PrecompiledHeadersServer.h" |
| 1008 | 35 #include "ModifyInstanceCommand.h" |
| 36 | |
|
1486
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1341
diff
changeset
|
37 #include "../../Core/Logging.h" |
| 1008 | 38 |
| 39 namespace Orthanc | |
| 40 { | |
|
1341
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
41 ModifyInstanceCommand::ModifyInstanceCommand(ServerContext& context, |
|
1572
904096e7367e
More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
42 RequestOrigin origin, |
|
1698
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
43 DicomModification* modification) : |
|
1341
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
44 context_(context), |
|
1572
904096e7367e
More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
45 origin_(origin), |
|
1341
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
46 modification_(modification) |
|
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
47 { |
|
1698
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
48 modification_->SetAllowManualIdentifiers(true); |
|
1341
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
49 |
|
1698
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
50 if (modification_->IsReplaced(DICOM_TAG_PATIENT_ID)) |
|
1341
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
51 { |
|
1698
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
52 modification_->SetLevel(ResourceType_Patient); |
|
1341
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
53 } |
|
1698
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
54 else if (modification_->IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID)) |
|
1341
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
55 { |
|
1698
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
56 modification_->SetLevel(ResourceType_Study); |
|
1341
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
57 } |
|
1698
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
58 else if (modification_->IsReplaced(DICOM_TAG_SERIES_INSTANCE_UID)) |
|
1341
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
59 { |
|
1698
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
60 modification_->SetLevel(ResourceType_Series); |
|
1341
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
61 } |
|
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
62 else |
|
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
63 { |
|
1698
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
64 modification_->SetLevel(ResourceType_Instance); |
|
1341
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
65 } |
|
1572
904096e7367e
More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
66 |
|
904096e7367e
More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
67 if (origin_ != RequestOrigin_Lua) |
|
904096e7367e
More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
68 { |
|
904096e7367e
More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
69 // TODO If issued from HTTP, "remoteIp" and "username" must be provided |
|
904096e7367e
More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
70 throw OrthancException(ErrorCode_NotImplemented); |
|
904096e7367e
More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
71 } |
|
1341
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
72 } |
|
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
73 |
|
479e31b13de5
Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
74 |
|
1698
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
75 ModifyInstanceCommand::~ModifyInstanceCommand() |
|
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
76 { |
|
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
77 if (modification_) |
|
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
78 { |
|
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
79 delete modification_; |
|
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
80 } |
|
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
81 } |
|
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
82 |
|
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
83 |
| 1008 | 84 bool ModifyInstanceCommand::Apply(ListOfStrings& outputs, |
| 85 const ListOfStrings& inputs) | |
| 86 { | |
| 87 for (ListOfStrings::const_iterator | |
| 88 it = inputs.begin(); it != inputs.end(); ++it) | |
| 89 { | |
| 90 LOG(INFO) << "Modifying resource " << *it; | |
| 91 | |
|
1099
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
92 try |
| 1008 | 93 { |
|
1099
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
94 std::auto_ptr<ParsedDicomFile> modified; |
| 1008 | 95 |
|
1099
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
96 { |
|
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
97 ServerContext::DicomCacheLocker lock(context_, *it); |
|
2521
6db878376018
support anonymization of CurrentRequestedProcedureEvidenceSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2471
diff
changeset
|
98 modified.reset(lock.GetDicom().Clone(true)); |
|
1099
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
99 } |
|
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
100 |
|
1698
d78b87f93bcf
DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1624
diff
changeset
|
101 modification_->Apply(*modified); |
| 1008 | 102 |
|
1099
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
103 DicomInstanceToStore toStore; |
|
1572
904096e7367e
More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
104 assert(origin_ == RequestOrigin_Lua); |
|
904096e7367e
More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
105 toStore.SetLuaOrigin(); |
|
1099
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
106 toStore.SetParsedDicomFile(*modified); |
|
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
107 // TODO other metadata |
|
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
108 toStore.AddMetadata(ResourceType_Instance, MetadataType_ModifiedFrom, *it); |
|
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
109 |
|
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
110 std::string modifiedId; |
|
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
111 context_.Store(modifiedId, toStore); |
| 1008 | 112 |
|
1099
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
113 // Only chain with other commands if this command succeeds |
|
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
114 outputs.push_back(modifiedId); |
|
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
115 } |
|
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
116 catch (OrthancException& e) |
|
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
117 { |
|
2471
51ea632f0c55
removed 'in Lua script' in error messages that is misleading since these commands can also be called from the API
amazy
parents:
2447
diff
changeset
|
118 LOG(ERROR) << "Unable to modify instance " << *it << ": " << e.What(); |
|
1099
060e8918d7a4
More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1008
diff
changeset
|
119 } |
| 1008 | 120 } |
| 121 | |
| 122 return true; | |
| 123 } | |
| 124 } |