Mercurial > hg > orthanc

annotate OrthancServer/Scheduler/ModifyInstanceCommand.cpp @ 2049:b89da14b3e8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 27 Jun 2016 11:33:22 +0200
parents b1291df2f780
children a3a65de1840f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
1900
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1698
diff changeset
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
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 *
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 * This program is free software: you can redistribute it and/or
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * modify it under the terms of the GNU General Public License as
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * published by the Free Software Foundation, either version 3 of the
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * License, or (at your option) any later version.
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 *
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 * In addition, as a special exception, the copyright holders of this
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * program give permission to link the code of its release with the
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * that use the same license as the "OpenSSL" library), and distribute
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * the linked executables. You must obey the GNU General Public License
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * in all respects for all of the code used other than "OpenSSL". If you
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * modify file(s) with this exception, you may extend this exception to
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * your version of the file(s), but you are not obligated to do so. If
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 * you do not wish to do so, delete this exception statement from your
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 * version. If you delete this exception statement from all source files
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 * in the program, then also delete it here.
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 *
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 * This program is distributed in the hope that it will be useful, but
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * WITHOUT ANY WARRANTY; without even the implied warranty of
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * General Public License for more details.
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 *
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 * You should have received a copy of the GNU General Public License
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 **/
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
1624
0a2ad4a6858f fix missing precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1572
diff changeset
33 #include "../PrecompiledHeadersServer.h"
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 #include "ModifyInstanceCommand.h"
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
1486
f967bdf8534e refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1341
diff changeset
36 #include "../../Core/Logging.h"
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 namespace Orthanc
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 {
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
40 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
41 RequestOrigin origin,
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
42 DicomModification* modification) :
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
43 context_(context),
1572
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
44 origin_(origin),
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
45 modification_(modification)
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
46 {
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
47 modification_->SetAllowManualIdentifiers(true);
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
48
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
49 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
50 {
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
51 modification_->SetLevel(ResourceType_Patient);
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
52 }
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
53 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
54 {
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
55 modification_->SetLevel(ResourceType_Study);
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
56 }
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
57 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
58 {
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
59 modification_->SetLevel(ResourceType_Series);
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
60 }
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
61 else
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
62 {
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
63 modification_->SetLevel(ResourceType_Instance);
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
64 }
1572
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
65
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
66 if (origin_ != RequestOrigin_Lua)
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
67 {
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
68 // 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
69 throw OrthancException(ErrorCode_NotImplemented);
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
70 }
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
71 }
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
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
74 ModifyInstanceCommand::~ModifyInstanceCommand()
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
75 {
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
76 if (modification_)
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
77 {
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
78 delete modification_;
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
79 }
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
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 bool ModifyInstanceCommand::Apply(ListOfStrings& outputs,
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 const ListOfStrings& inputs)
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 {
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 for (ListOfStrings::const_iterator
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 it = inputs.begin(); it != inputs.end(); ++it)
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 {
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 LOG(INFO) << "Modifying resource " << *it;
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90
1099
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
91 try
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 {
1099
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
93 std::auto_ptr<ParsedDicomFile> modified;
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94
1099
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
95 {
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
96 ServerContext::DicomCacheLocker lock(context_, *it);
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
97 modified.reset(lock.GetDicom().Clone());
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
98 }
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
99
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
100 modification_->Apply(*modified);
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101
1099
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
102 DicomInstanceToStore toStore;
1572
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
103 assert(origin_ == RequestOrigin_Lua);
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
104 toStore.SetLuaOrigin();
1099
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
105 toStore.SetParsedDicomFile(*modified);
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
106 // TODO other metadata
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
107 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
108
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
109 std::string modifiedId;
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
110 context_.Store(modifiedId, toStore);
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111
1099
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
112 // 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
113 outputs.push_back(modifiedId);
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
114 }
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
115 catch (OrthancException& e)
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
116 {
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
117 LOG(ERROR) << "Unable to modify instance " << *it << " in a Lua script: " << e.What();
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
118 }
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 }
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 return true;
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 }
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 }